Merge commit 'origin/template' into mail
[matthijs/servers/drsnuggles.git] / etc / nullmailer / adminaddr