mark_story 3fc627c5f8 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Controller/Component/AuthComponent.php lib/Cake/Error/ErrorHandler.php lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php lib/Cake/View/Helper/HtmlHelper.php		2013-03-30 22:12:27 -04:00
..
Email	Add scope to email logging.	2013-03-01 22:24:02 -05:00
Http	Fix CS error	2013-03-31 00:23:03 +05:30
CakeRequestTest.php	Merge branch 'master' into 2.4	2013-02-24 20:24:26 -05:00
CakeResponseTest.php	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
CakeSocketTest.php	Attempt to get more tests passing on travis ci.	2013-02-19 22:17:47 -05:00