Merge branch 'versions/2.6.1'

2.6.1 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.1 - TBD
+## 2.6.1 - 2015-11-24
 
 ### Added
 
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#25](https://github.com/zendframework/zend-code/pull/25) changes the
+  `doctrine/common` suggestion/dev-dependency to the more specific
+  `doctrine/annotations` package (which is what is actually consumed).
 
 ## 2.6.0 - 2015-11-18