mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
Email	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
Http	Merge branch '2.0' into 2.1	2012-02-03 21:54:50 -05:00
CakeRequestTest.php	Merge branch '2.0' into 2.1	2012-01-06 23:02:16 -05:00
CakeResponseTest.php	Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive	2012-01-19 01:08:45 -04:30
CakeSocketTest.php	Replacing test case compatibility functions	2011-11-16 21:07:08 -05:00