José Lorenzo Rodríguez c559b9c22d Merge remote branch 'origin/2.0' into 2.0 ... Conflicts: cake/console/templates/skel/config/database.php.default cake/libs/model/datasources/dbo/dbo_sqlite.php		2010-12-05 20:51:37 -04:30
..
default	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
skel	Merge remote branch 'origin/2.0' into 2.0	2010-12-05 20:51:37 -04:30