From: Torsten Werner <twerner@debian.org>
Date: Thu, 3 Feb 2011 16:53:27 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b3fcdc882c96d2f2d21e5d29fdc08a450f1c291b;hp=c992384e4a2be0fe18028b817afccef32e551bd3;p=dak.git

Merge branch 'master' into dbtests
---

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index dfd12bf9..21e17689 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
-   MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails