fixed FormHelper to allow create() on Mock Models without errors
Cannot use php 5.4+ array syntax for 2.x.
Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock

fixed FormHelper to allow create() on Mock Models without errors
Add additional test for f23d811ff59c50ef278e98bb75f4ec1e7e54a5b3

I neglected to put a negative test to ensure validatePost fails when the
URL differs.
Merge branch 'master' into 2.5
Update version number to 2.5.0-RC2
Backporting overwrite() from 3.0 to 2.6.
Merge branch '2.5' into 2.6

Conflicts:
	lib/Cake/VERSION.txt
Update version number to 2.4.8
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite
Fix coding standards error.
Stricter string comparisons.
Merge pull request #3415 from dereuromark/master-strict

Stricter string comparisons.
More coding standard corrections.
Merge pull request #3416 from dereuromark/master-strict

More coding standard corrections.
Fix FormHelper::postLink() not working when SecurityComponent is enabled.

The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
Update version number to 2.4.9
Removed incorrect usage of @deprecated phpDoc

@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
Merge pull request #3421 from thinkingmedia/patch-1

Removed incorrect usage of @deprecated phpDoc
Grammar fixes

@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.