From c088abb4fbf56143877df19c442907b73abc1766 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 23 Jul 2015 16:47:55 -0500
Subject: [PATCH 1/2] Bump branch-alias versions

- master: 2.6-dev
- develop: 2.7-dev
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4376a1ef..9fcd66a7 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,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": {

From a5c094f1cc778e8c823ce52ecd375b1dc321abcb Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 23 Jul 2015 16:48:58 -0500
Subject: [PATCH 2/2] Updated CHANGELOG

- Set date for 2.6.0.
- Merged 2.5.2 and 2.6.0 entries, as I'm skipping 2.5.2.
---
 CHANGELOG.md | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 635de5f8..805f9101 100644
--- a/CHANGELOG.md
+++ b/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 - 2015-07-23
 
 ### Added
 
@@ -20,24 +20,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
-
-## 2.5.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#3](https://github.com/zendframework/zend-servicemanager/pull/3) properly updates the
   codebase to PHP 5.5, by taking advantage of the default closure binding
   (`$this` in a closure is the invoking object when created within a method). It