Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

1
2
3
4
From: ISPConfig <postmaster@localhost.localdomain>
Subject: Welcome to your new email account.
 
Welcome to your new email account. Your webmaster.