Merge branch 'master' into 2.5

Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
This commit is contained in:
ADmad 2013-10-30 02:34:09 +05:30
commit d9ca148499
73 changed files with 688 additions and 539 deletions

View file

@ -637,7 +637,7 @@ class SchemaShellTest extends CakeTestCase {
/**
* test that passing name and file creates the passed filename with the
* passed classname
* passed class name
*
* @return void
*/