X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=66adb7711a84e2d697d2d1a5cef860fd170235b6;hb=1aec7073957e77514ba032909f42399960994448;hp=4725f0e6ce0bac7fe7039e8f63a066bb3f84ed9f;hpb=012aedcab82f83d865c7eeddef4fdab598331f9a;p=developers-reference.git

diff --git a/common.ent b/common.ent
index 4725f0e..66adb77 100644
--- a/common.ent
+++ b/common.ent
@@ -37,7 +37,7 @@
 <!ENTITY ftp-upload-host "ftp.upload.debian.org">
 <!ENTITY ftp-eu-upload-host "ftp.eu.upload.debian.org">
 <!ENTITY ssh-upload-host "ssh.upload.debian.org">
-<!ENTITY ftp-master-mirror "merkel.debian.org">
+<!ENTITY ftp-master-mirror "ries.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
@@ -133,6 +133,7 @@
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">
 <!ENTITY email-devel-ref "<email>developers-reference@&packages-host;</email>">
+<!ENTITY email-debian-account-manager "<email>da-manager@debian.org</email>">
 <!ENTITY email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel "<email>debian-devel@&lists-host;</email>">
 <!ENTITY email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
@@ -156,6 +157,7 @@
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!ENTITY email-bts-control "<email>control@&bugs-host;</email>">
 <!ENTITY email-security-team "<email>team@security.debian.org</email>">
+<!ENTITY email-nonfree-release "<email>nonfree@release.debian.org</email>">
 
 <!-- misc Debian info -->
 <!ENTITY file-bts-docs "<filename>/usr/share/doc/debian/bug-*</filename>">