José Lorenzo Rodríguez 5dddb362ec Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: lib/Cake/config/ini_file.php		2010-12-06 09:42:52 -04:30
..
App.php	Removing dead code	2010-12-05 20:38:17 -04:30
Configure.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-06 09:42:52 -04:30
Object.php	Fixing some errors in loading view classes	2010-12-04 22:06:53 -04:30