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
..
I18n.php	Stating to move loggers to the new folder	2010-12-04 13:50:26 -04:30
L10n.php	Moving I18n related classes to the new folder schema	2010-12-04 13:45:07 -04:30
Multibyte.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-06 09:42:52 -04:30