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
..
Email	Merge branch 'master' into 2.3	2012-12-13 20:20:42 -05:00
Http	Remove todo's whihc have been removed in e02eab05d5	2012-12-10 17:06:06 +01:00
CakeRequest.php	Docblock fixes	2012-11-29 04:36:29 +05:30
CakeResponse.php	ignore last few silencers for code sniffer	2012-12-10 17:57:22 +01:00
CakeSocket.php	fix all warnings except TODO warnings	2012-11-14 12:56:10 +01:00