Juan Basso 620a65b2fc Merge branch '2.0' into 2.0-api-doc ... Conflicts: lib/Cake/Test/Case/View/Helper/CacheHelperTest.php lib/Cake/Utility/Debugger.php		2011-08-14 21:12:05 -04:00
..
Engine	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
CakeLog.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
CakeLogInterface.php	Updated some file headers to include correct license and copyright.	2011-07-31 19:14:36 -04:00