Merge branch 'develop'

Promote develop to master, becoming the next stable release.
zendframework · Mar 12, 2014 · a41bd39 · a41bd39
commit a41bd39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.23"
     },
     "extra": {
         "branch-alias": {

diff --git a/test/EscaperTest.php b/test/EscaperTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */