Merge branch 'master' of /home/git/repositories/grungy/ispconfig3

Marius Cramer

2014-01-02 b80a703a7fc421a49e6b892e805b6a70b9f8f386

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