Merge branch 'releases/2.2.0' into develop

weierophinney · weierophinney · commit 076244ae1a12 · 2013-05-01T16:45:50.000-05:00
2.2.0rc1 readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php
diff --git a/composer.json b/composer.json
@@ -21,8 +21,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": {
