keep the deprecated three-letter-code
Merge pull request #1191 from dereuromark/2.4-validation

correct and unify country codes for validation
make tree recovery much, much simpler
Even less queries
correct coding standards
Added autoParagraph to TextHelper with proper test cases and made it non-static
Add option to skip exception types for logging.

add blacklisting for logging exceptions

add test for skipping exception logging, and fix typo and cs

add example to docblock in core.php for skipLog

remove app_error.php skips, those are no longer used in 2.x

use assertContains instead of assertRegExp

check for instanceof, instead of matching names
Merge pull request #1186 from ceeram/2.4-blacklist

2.4 blacklist
Fix docblock of bake template
Merge pull request #1193 from cakephp/feature/faster-tree-recover

make tree recovery much, much simpler
Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Console/Shell.php
Ensure referrer is saved in session even when AuthComponent::$loginRedirect is set.
Clarified redirectUrl() docblock.
Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in ClassRegistry::init().
Closes #3724
Merge pull request #1200 from ADmad/2.3-classregistry

Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in...
Add missing App::uses() to avoid fatal error
Merge pull request #1201 from cakephp/master-app-uses

Add missing App::uses() to avoid fatal error
Merge pull request #1107 from TeckniX/patch-1

Added autoParagraph functionality to 2.4 Branch
Fix docblock typo of ObjectCollection class
Merge pull request #1204 from bcrowe/master

Fix docblock typo of ObjectCollection class
spelling correction.