mark_story ac9a212d44 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/Utility/String.php		2015-01-11 15:25:18 -05:00
..
App.php	Merge branch 'master' into 2.6	2014-11-07 15:13:46 -05:00
CakePlugin.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
Configure.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
Object.php	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00