Jose Lorenzo Rodriguez 343d3279b9 Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Test/Case/Utility/FileTest.php lib/Cake/VERSION.txt		2014-04-06 21:50:41 +02:00
..
DbAclTest.php	Log errors instead of calling trigger_error()	2014-01-29 17:51:07 +07:00
IniAclTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
PhpAclTest.php	more missing doc block tags added	2014-04-02 03:02:37 +02:00