Merge remote-tracking branch 'upstream/master'

zendframework · May 9, 2013 · 2c9c99a · 2c9c99a
commit 2c9c99a
Show file tree

Hide file tree

Showing 50 changed files with 4,935 additions and 2,377 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {