]> git.donarmstrong.com Git - dak.git/commitdiff
Merge remote branch 'drkranz/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Wed, 13 Oct 2010 17:33:50 +0000 (19:33 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 13 Oct 2010 17:33:50 +0000 (19:33 +0200)
* drkranz/master:
  process_new.py: s/Binaries/No-Binaries/

Signed-off-by: Joerg Jaspert <joerg@debian.org>
tools/debianqueued-0.9/debianqueued

index cc016d3a4f8f5993c6e10242b53848f274843a2b..e229ac076996bf19a798735866c795ad9c46f370 100755 (executable)
@@ -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