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
..
Cache	Fix typos	2013-03-05 00:05:14 -07:00
Config	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Configure	== to === and != to !== where applicable	2013-02-12 03:38:08 +01:00
Console	Merge branch 'master' into 2.4	2013-03-26 20:31:54 -04:00
Controller	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
Core	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
Error	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
Event	spelling correction.	2013-03-29 11:16:20 +01:00
I18n	Adding Kalaallisut locale	2013-03-01 22:02:42 -05:00
Log	Merge branch 'master' into 2.4	2013-03-09 12:40:59 -05:00
Model	Merge branch 'master' into 2.4	2013-03-26 20:31:54 -04:00
Network	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
Routing	Fix typos	2013-03-05 00:05:14 -07:00
Test	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
TestSuite	Merge branch 'master' into 2.4	2013-03-26 20:31:54 -04:00
Utility	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
View	Merge branch 'master' into 2.4	2013-03-30 22:12:27 -04:00
basics.php	Merge branch 'pr-cli' into 2.4	2013-02-28 21:23:03 -05:00
bootstrap.php	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
LICENSE.txt	Formatted CSF address	2013-02-08 21:08:15 +09:00
VERSION.txt	Update version number to 2.3.1	2013-03-02 22:23:11 -05:00