Merge branch 'version/bump'

Bump to 2.0.6dev
patrioticcow · Dec 3, 2012 · 2cdd471 · 2cdd471
2 parents b09825f + 23ca017
commit 2cdd471
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -5,25 +5,15 @@ Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?bra
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.0.5*
+*Zend Framework 2.0.6*
 
-This is the fifth maintenance release for the 2.0 series.
+This is the sixth maintenance release for the 2.0 series.
 
-29 Nov 2012
+XX YYY 2012
 
-### UPDATES IN 2.0.5
+### UPDATES IN 2.0.6
 
-*Security Changes*
-
-The classes `Zend\Session\Validator\RemoteAddr` and `Zend\View\Helper\ServerUrl`
-were identified as having incorrect logic for detection of proxy servers. Both
-were updated to provide better detection, as well as more configuration
-surrounding detection. 
-
-For more information on the security fixes, please see
-http://framework.zend.com/security/advisory/ZF2012-04
-
-For all other changes, please see CHANGELOG.md.
+Please see CHANGELOG.md.
 
 ### SYSTEM REQUIREMENTS
 

diff --git a/library/Zend/Version/Version.php b/library/Zend/Version/Version.php
@@ -23,7 +23,7 @@ final class Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '2.0.4';
+    const VERSION = '2.0.6dev';
 
     /**
      * Github Service Identifier for version information is retreived from