José Lorenzo Rodríguez Urdaneta ab6e3eecd9 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit ... Conflicts: cake/console/libs/testsuite.php		2010-07-13 20:22:40 -04:30
..
libs	Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit	2010-07-13 20:22:40 -04:30
templates	Removing closing ?> on bake templates so they match the rest of CakePHP.	2010-07-01 18:19:37 -04:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.php	Fixing notices introduced in last commit	2010-07-07 23:03:24 -04:30
error.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00