Merge branch 'master' into connorhu-patch-1

Author: connorhu

lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -35,6 +35,13 @@ class sfDoctrineFormGenerator extends sfGenerator
      */
     public $pluginModels = array();
 
+    /**
+     * Array of all configuration params.
+     *
+     * @var array
+     */
+    public $params = array();
+
     /**
      * Initializes the current sfGenerator instance.
      *