From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 13 Oct 2010 17:33:50 +0000 (+0200)
Subject: Merge remote branch 'drkranz/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a0a104cbef06ef12c1d57f8ac664003c265ec288;hp=8bd471bcd1e6975fe66d3a0778ad8d1bb9ccb87d;p=dak.git

Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  process_new.py: s/Binaries/No-Binaries/

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index cc016d3a..e229ac07 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2339,7 +2339,7 @@ sub send_mail($$$) {
     strftime( "%a, %d %b %Y %T %z", ( localtime(time) ) );
   my $message = <<__MESSAGE__;
 To: $addr
-From: Archive Administrator <dak\@ftp-master.debian.org>
+From: Debian FTP Masters <ftpmaster\@ftp-master.debian.org>
 Subject: $subject
 Date: $date
 X-Debian: DAK