From 6e039f13baf101b66316ec0e008e5870ce73a090 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 22 Feb 2016 15:41:36 -0600
Subject: [PATCH] 2.7.0 readiness

- Merged 2.6.1 (unreleased) and 2.7.0 entries in CHANGELOG
- Updated branch aliases:
  - dev-master => 2.7-dev
  - dev-develop => 2.8-dev
---
 CHANGELOG.md  | 17 -----------------
 composer.json |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0144bcc7..047b8389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,23 +25,6 @@ All notable changes to this project will be documented in this file, in reverse
   - zend-hydrator v2.1
   - zend-servicemanager v3
   - zend-stdlib v3
-
-## 2.6.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#14](https://github.com/zendframework/zend-form/pull/14) ensures that
   collections can remove all elements when populating values.
 
diff --git a/composer.json b/composer.json
index b1541b93..26c5c128 100644
--- a/composer.json
+++ b/composer.json
@@ -50,8 +50,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+            "dev-master": "2.7-dev",
+            "dev-develop": "2.8-dev"
         }
     },
     "autoload-dev": {