Merge branch 'releases/2.2.0' into develop

2.2.0rc1 readiness Conflicts: README.md library/Zend/Version/Version.php
zendframework · May 1, 2013 · 1e0e8f4 · 1e0e8f4
commit 1e0e8f4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -41,8 +41,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev",
-            "dev-develop": "2.2-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {