mark_story 6f5ff4d7dd Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Model/CakeSchema.php lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php		2012-12-13 20:20:42 -05:00
..
AbstractTransport.php	Docblock fixes	2012-11-29 04:36:29 +05:30
CakeEmail.php	Docblock fixes	2012-11-29 04:36:29 +05:30
DebugTransport.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
MailTransport.php	do not pass 5th argument to mail() when in safe mode, even with a falsy value mail() will return false, fixes #3452	2012-12-13 18:22:45 +01:00
SmtpTransport.php	adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010	2012-07-21 20:28:38 +01:00