mark_story 4af6039107 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Console/Command/Task/ModelTask.php lib/Cake/Model/Model.php		2013-01-26 21:16:26 -05:00
..
CakeNumber.php	Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string	2013-01-11 17:00:06 +00:00
CakeTime.php	Merge branch 'master' into 2.3	2013-01-26 21:16:26 -05:00
ClassRegistry.php	remove unused local vars	2013-01-23 17:22:06 +01:00
Debugger.php	Fix string '0' not being exported correctly.	2013-01-09 23:04:58 -05:00
File.php	double spaces to single ones	2012-12-22 23:48:15 +01:00
Folder.php	remove unused local variables and a few improvements	2012-12-23 13:53:13 +01:00
Hash.php	Merge branch 'master' into 2.3	2013-01-26 21:16:26 -05:00
Inflector.php	cookie is not uninflected but irregular	2012-12-25 00:21:12 +01:00
ObjectCollection.php	double spaces to single ones	2012-12-22 23:48:15 +01:00
Sanitize.php	adjusting the way the regex is done so its easier to read	2012-09-13 21:03:38 +01:00
Security.php	Remove Security.level from core.php	2013-01-22 09:56:01 +01:00
Set.php	double spaces to single ones	2012-12-22 23:48:15 +01:00
String.php	remove unused local vars	2013-01-23 17:22:06 +01:00
Validation.php	double spaces to single ones	2012-12-22 23:48:15 +01:00
Xml.php	Merge branch 'master' into 2.3	2013-01-26 21:16:26 -05:00