cakephp2-php8/lib
Jose Lorenzo Rodriguez 77788a965d Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader
Conflicts:
	lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
	lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php
	lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
2011-05-08 22:08:31 -04:30
..
Cake Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader 2011-05-08 22:08:31 -04:30