mark_story 0e56d742b8 Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/BehaviorCollection.php lib/Cake/basics.php		2012-01-08 21:59:18 -05:00
..
App.php	Merge branch '2.1' of github.com:cakephp/cakephp into 2.1	2012-01-05 19:58:15 -04:30
CakePlugin.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
Configure.php	Update Configure::load() to use Set::merge()	2012-01-07 10:45:48 -05:00
Object.php	Fix bare require() to use App::uses()	2011-12-06 20:09:05 -05:00