Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
This commit is contained in:
ADmad 2013-07-14 10:58:55 +05:30
commit d161b21ae1
146 changed files with 207 additions and 920 deletions

View file

@ -533,7 +533,6 @@ class CakeSchemaTest extends CakeTestCase {
/**
* testSchemaReadWithAppModel method
*
* @access public
* @return void
*/
public function testSchemaReadWithAppModel() {