Removed else clauses after redirects and added return before redirect() and flash() calls
Updating some View files to follow convention
Update version number to 2.3.9
Fixed statement about Security:hash's salt parameter

Just nitpicking, but it prepends the salt, not appends it:
https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120
Merge pull request #1509 from ravage84/prepend-salt

Fixed statement about Security:hash's salt parameter
Making CakeTime display 'about X ago' when time passed is lower than accuracy

Removing unnecessary else

Also support 'about' times for future times

Make 'about' times translateable in all languages
Merge pull request #1511 from ankr/caketime_accuracy_about

Making CakeTime display 'about X ago' when time passed is lower than acc...
refactor methods to avoid else block on returning early
Merge pull request #1506 from oldskool/master

View file conventions. Fixes #3949.
Merge pull request #1513 from dereuromark/2.4-return-early

2.4 return early
Merge pull request #1496 from ravage84/else-clause-after-redirect

Removed else clauses after redirects and added return before redirect() ...
Update doc blocks.
Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Utility/CakeTime.php
	lib/Cake/VERSION.txt
Fix failing test from merge with 2.3

Fix a failed test from bad merge and remove nested conditions.
Correctly encode confirm handlers

With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.