Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2014-05-11 9b155852f4a352ddb793ac4252702170b6509c17

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