coding standards elseif
coding standards whitespace and single quote
more whitespace coding standard corrections
Merge pull request #1341 from dereuromark/master-coding-standards

Coding standards
incorrect tab to space - whitespace coding standards
Update version number to 2.3.6
Merge pull request #1342 from dereuromark/master-coding-standards

incorrect tab to space - whitespace coding standards
Minor optimization of CakeEmail::_wrap().
Merge pull request #1343 from Phally/patch-1

Minor optimization of CakeEmail::_wrap().
Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/VERSION.txt