Merge branch 'hotfix/2435' into develop

Forward port zendframework/zendframework#2435
zendframework · Oct 1, 2012 · 1c2b629 · 1c2b629
commit 1c2b629
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/ServiceLocator/Generator.php b/src/ServiceLocator/Generator.php
@@ -31,6 +31,9 @@ class Generator
     /** @var DependencyInjectorProxy */
     protected $injector;
 
+    /**
+     * @var null|string
+     */
     protected $namespace;
 
     /**