Jose Lorenzo Rodriguez d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3 ... Conflicts: lib/Cake/Model/Behavior/TranslateBehavior.php lib/Cake/Model/CakeSchema.php lib/Cake/Utility/CakeTime.php lib/Cake/Utility/ClassRegistry.php lib/Cake/View/MediaView.php		2012-09-25 16:36:03 +02:00
..
ConfigReaderInterface.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
IniReader.php	Merge remote-tracking branch 'origin/master' into 2.3	2012-09-25 16:36:03 +02:00
PhpReader.php	Merge pull request #772 from bar/master-fix-phpreader	2012-08-16 11:00:27 -07:00