Merge branch 'master' into 2.5

Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
This commit is contained in:
mark_story 2014-03-21 22:55:28 -04:00
commit 8acb75425d
10 changed files with 122 additions and 72 deletions

View file

@ -1,6 +1,6 @@
<?php
/**
* This class helpes in indirectly testing the functionalities of CakeTestCase::assertTags
* This class helps in indirectly testing the functionalities of CakeTestCase::assertTags
*
* @package Cake.Test.Fixture
*/
@ -115,4 +115,5 @@ class AssertTagsTestCase extends CakeTestCase {
);
$this->assertTags($input, $pattern);
}
}