Update version number to 2.5.1
Harden the `bin/cake` script to avoid breakage when local shell environment has a `CDPATH` set.
Add 'feedback' to uninflected single and plurals
Merge pull request #3530 from beporter/feature/bin-cake-cdpath-fix

Harden the `cake` script to avoid `CDPATH` breakage.
Merge pull request #3528 from Marlinc/patch-1

Add 'feedback' to uninflected single and plurals
Fix incorrect status line parsing in HttpSocketResponse.

Allow for multi-word status reasons.

Closes #3545
Fixed secure form hash for special url.

No htmlspecialchars encode and without fragment identifer.
Removed unnecessary conditional branch, fixed test and comment.
Add additional test case for named parameters.

Refs #3525
Merge branch 'secure-form-url-special'

Merge pull request #3525 into master. This fixes additional issues with
form tampering prevention by accomodating more URL types.
Optimize renew().

Don't call session_id() twice when we can use a local variable to store
the current session id.

Fixes #3531
Merge branch 'master' into 2.6

Conflicts:
	lib/Cake/VERSION.txt
Merge remote-tracking branch 'origin/2.6' into 3.0

Conflicts:
	lib/Cake/Console/cake
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Network/Http/HttpSocketResponse.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/View/Helper/FormHelper.php