Merge remote branch 'origin/2.0' into 2.0-class-loading

Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
This commit is contained in:
José Lorenzo Rodríguez 2011-01-02 02:00:03 -04:30
commit 4c0e06c451
587 changed files with 3504 additions and 3462 deletions

View file

@ -15,7 +15,6 @@
* @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package cake
* @subpackage cake.cake
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/