Merge remote branch 'mhy/master'

diff --combined config/debian/dak.conf
index f978505c4025848120aec3d2f2dbe8d5e5eadc9e,39379ec2c72baf435e0234b9f2e92a8312957171..8b1b43220b4b9600a15f352462defbb94f4fc328
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -98,6 -98,19 +98,6 @@@ R
     Bcc "removed-packages@qa.debian.org";
  };
  
 -Import-Archive
 -{
 -  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
 -};
 -
 -Import-Keyring
 -{
 -  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
 -    {
 -      Debian-Maintainer "true";
 -    };
 -};
 -
  Import-LDAP-Fingerprints
  {
    LDAPDn "ou=users,dc=debian,dc=org";
@@@ -353,16 -366,6 +353,6 @@@ D
    Unicode "false"
  };
  
- Archive
- {
-   ftp-master
-   {
-     OriginServer "ftp-master.debian.org";
-     PrimaryMirror "ftp.debian.org";
-     Description "Master Archive for the Debian project";
-   };
- };
- 
  Urgency
  {
    Default "low";