Merge branch 'release'

zendframework · Sep 14, 2012 · ac486fd · ac486fd
2 parents a2c3065 + aa4e534
commit ac486fd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/library/Zend/ServiceManager/AbstractPluginManager.php b/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -40,7 +40,9 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
     protected $autoAddInvokableClass = true;
 
     /**
-     * @var mixed Options to use when creating an instance
+     * Options to use when creating an instance
+     *
+     * @var mixed
      */
     protected $creationOptions = null;