Merge branch 'versions/2.6.0'

weierophinney · weierophinney · commit 07ad9388e4d4 · 2016-02-08T13:03:52.000-06:00
2.6.0 readiness
diff --git a/composer.json b/composer.json
@@ -9,8 +9,8 @@
     "homepage": "https://github.com/zendframework/zend-text",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "require": {
