Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2

cakephp · Sep 24, 2009 · 4530e70 · 4530e70
2 parents 6946bb0 + cd64043
commit 4530e70
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -206,6 +206,7 @@ class EmailComponent extends Object{
  * - timeout
  * - username
  * - password
+ * - client
  *
  * @var array
  * @access public