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.
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
Refactored the fix
Merge pull request #1508 from fuga/feature/email-config

making the config method of email-transport-classes mergable
Merge pull request #1528 from mvdriel/caketime-fix

Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
Merge branch 'master' into router-redirect-elements

* master:
  Refactored the fix
  Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
  Apply ADmad's patch and update testConfig method according to a new specification.
  making the config method of email-transport-classes mergable into the current config value.