Merge branch 'release/1.0.2'

README.md

@@ -109,6 +109,7 @@ return array(
 * route: The route to use for assembling the uri.
 * uri: The direct uri to use (use instead of route).
 * params: Optional params to include during route assembly.
+* query_params: Optional params to include in the query string during assembly.
 
 #### Rbac specific options
 

composer.json

@@ -17,24 +17,24 @@
 
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zend-console": "2.*",
-        "zendframework/zend-eventmanager": "2.*",
-        "zendframework/zend-form": "2.*",
-        "zendframework/zend-modulemanager": "2.*",
-        "zendframework/zend-mvc": "2.*",
-        "zendframework/zend-permissions-acl": "2.*",
-        "zendframework/zend-permissions-rbac": "2.*",
-        "zendframework/zend-serializer": "2.*",
-        "zendframework/zend-servicemanager": "2.*",
-        "zendframework/zend-stdlib": "2.*",
-        "zendframework/zend-uri": "2.*",
-        "zendframework/zend-view": "2.*"
+        "zendframework/zend-console": "~2.2",
+        "zendframework/zend-eventmanager": "~2.2",
+        "zendframework/zend-form": "~2.2",
+        "zendframework/zend-modulemanager": "~2.2",
+        "zendframework/zend-mvc": "~2.2",
+        "zendframework/zend-permissions-acl": "~2.2",
+        "zendframework/zend-permissions-rbac": "~2.2",
+        "zendframework/zend-serializer": "~2.2",
+        "zendframework/zend-servicemanager": "~2.2",
+        "zendframework/zend-stdlib": "~2.2",
+        "zendframework/zend-uri": "~2.2",
+        "zendframework/zend-view": "~2.2"
     },
 
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "satooshi/php-coveralls": "dev-master",
-        "zend/zend-config": "2.*"
+        "zendframework/zend-config": "~2.2"
     },
 
     "suggest": {