cakephp2-php8/cake/tests/cases/libs/controller/components
José Lorenzo Rodríguez 4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	app/webroot/index.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
..
auth Merge branch 'clean-get' into 2.0 2011-02-21 12:47:41 -05:00