making the config method of email-transport-classes mergable into the current config value.
Correctly encode confirm handlers

With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
Apply ADmad's patch and update testConfig method according to a new specification.
correct doc blocks as per cs
Corrected translation string
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
Merge pull request #1516 from dmromanov/2.4-translations

Corrected translation string
Merge pull request #1512 from aleho/2.4

Correctly encode confirm handlers
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
Removed trailing space