making the config method of email-transport-classes mergable into the current config value.
Apply ADmad's patch and update testConfig method according to a new specification.
Use inner join instead of a left join.

In some database servers an INNER join performs better than a LEFT join.

Fixes #3979
Allow CakeEmail::template() to disable layout rendering.

Fix the code to act as documented. Sending template('view', null) should
disable layout rendering.

Fixes #3983
removed not used $i variable

removed not used $i variable
Merge pull request #1518 from andraskende/master

removed not used $i variable
removed $i variable, it not being used...

removed $i variable, it not being used...
Merge pull request #1519 from andraskende/master

removed $i variable, it not being used...
Makes the locale test not always pass, be verbose when it is skipped.
Adds German locale for Travis.
Merge pull request #1521 from Phally/master-locale

Properly test locale settings
Fix formatting with locales using , as decimal separator

No double number formatting for readable size

Fixed testPrecisionLocalized for travis (when locale is missing?)

Switched locale to nl_NL and fixed test

Skip test when locale is not available
Makes the locale test not always pass, be verbose when it is skipped.
Merge pull request #1520 from mvdriel/cakenumber-fix

Cakenumber fix
Merge pull request #1523 from tersmitten/improved-tests-that-use-setlocale

Makes the locale test not always pass, be verbose when it is skipped.
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
Minor Sanitize::escape() update

If the Datasource is not going to be used, do access it.
Merge pull request #1529 from styxit/master

Minor Sanitize::escape() update
Refactored the fix
Merge pull request #1508 from fuga/feature/email-config

making the config method of email-transport-classes mergable