Merge branch 'hotfix/5451' into develop

Forward port zendframework/zendframework#5451 Conflicts: library/Zend/Filter/composer.json
zendframework · Nov 11, 2013 · 1f00186 · 1f00186
commit 1f00186
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,7 @@
         "zendframework/zend-crypt": "Zend\\Crypt component",
         "zendframework/zend-i18n": "Zend\\I18n component",
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-        "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
-        "zendframework/zend-stdlib": "Zend\\Stdlib component"
+        "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
     },
     "extra": {
         "branch-alias": {