Merge branch 'versions/2.6.0'

weierophinney · weierophinney · commit 8682c12e9870 · 2016-02-04T13:52:41.000-06:00
2.6.0 readiness
diff --git a/composer.json b/composer.json
@@ -34,8 +34,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "autoload-dev": {
