Permalink
Browse files

Merge branch 'release/2.0.2'

  • Loading branch information...
2 parents c620291 + 67a4e33 commit 1a77505473b0d5add8ced03b20b8fb3e12163ce9 @weierophinney weierophinney committed Sep 21, 2012
Showing with 19 additions and 5 deletions.
  1. +14 −0 CHANGELOG.md
  2. +4 −4 README.md
  3. +1 −1 library/Zend/Version/Version.php
View
14 CHANGELOG.md
@@ -1,5 +1,19 @@
# CHANGELOG
+## 2.0.2:
+
+- 2383: Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell
+ escaping to the test runner (https://github.com/zendframework/zf2/pull/2383)
+- 2393: Trying to solve issue ZF2-558
+ (https://github.com/zendframework/zf2/pull/2393)
+- 2398: Segment route: add fix for optional groups within optional groups
+ (https://github.com/zendframework/zf2/pull/2398)
+- 2400: Use 'Router' in http env and 'HttpRouter' in cli
+ (https://github.com/zendframework/zf2/pull/2400)
+- 2401: Better precision for userland fmod algorithm
+ (https://github.com/zendframework/zf2/pull/2401)
+
+
## 2.0.1:
- 2285: Seed RouteMatch params as long as params is set. This permits setting an
View
8 README.md
@@ -4,13 +4,13 @@ Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?bran
## RELEASE INFORMATION
-*Zend Framework 2.0.1*
+*Zend Framework 2.0.2*
-This is the first maintenance release for the 2.0 series.
+This is the second maintenance release for the 2.0 series.
-20 Sep 2012
+21 Sep 2012
-### UPDATES IN 2.0.1
+### UPDATES IN 2.0.2
Please see [CHANGELOG.md](CHANGELOG.md).
View
2 library/Zend/Version/Version.php
@@ -23,7 +23,7 @@
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.0.1';
+ const VERSION = '2.0.2';
/**
* Github Service Identifier for version information is retreived from

0 comments on commit 1a77505

Please sign in to comment.