Merge branch 'master' into 'master'

Marius Burkard

2015-12-08 10e9f75e0948d9dd72a4431c67292a05d582483c

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