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

This commit is contained in:
mark_story 2009-09-23 23:05:51 -04:00
commit 4530e706a4

View file

@ -206,6 +206,7 @@ class EmailComponent extends Object{
* - timeout
* - username
* - password
* - client
*
* @var array
* @access public