Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

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