Merge branch 'versions/2.6.0'

2.6.0 readiness

Author: weierophinney

CHANGELOG.md

@@ -27,24 +27,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#70](https://github.com/zendframework/zend-mail/pull/70) updates dependencies
   to stable, forwards-compatible versions, and removes unused dependencies.
 
-## 2.5.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.5.2 - 2015-09-10
 
 ### Added

composer.json

@@ -29,8 +29,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": {