Merge branch 'versions/2.6.0'

2.6.0 readiness

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.0 - TBD
+## 2.6.0 - 2016-02-17
 
 ### Added
 
@@ -38,24 +38,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#56](https://github.com/zendframework/zend-validator/pull/56) fixes the regex
   in the `Ip` validator to escape `.` characters used as IP delimiters.
 
-## 2.5.5 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.5.4 - 2016-02-17
 
 ### Added

composer.json

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