Update Mirrors.masterlist from mirrorteam git

CVS version numbers

english/mirror/Mirrors.masterlist: 1.2636 -> 1.2637

1 files changed, 12 insertions, 32 deletions

diff --git a/english/mirror/Mirrors.masterlist b/english/mirror/Mirrors.masterlist
index 06110638e3c..6259bd4ac26 100644
--- a/english/mirror/Mirrors.masterlist
+++ b/english/mirror/Mirrors.masterlist
@@ -1700,6 +1700,7 @@ Archive-architecture: amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64
 Archive-http: /debian/
 Archive-rsync: debian/
 Maintainer: Benedikt Spranger <b.spranger@tu-bs.de>
+Comment: [2017-02] maintainer address bounces
 Country: DE Germany
 Location: Braunschweig
 Sponsor: TU Braunschweig http://www.tu-bs.de/
@@ -3186,17 +3187,6 @@ Location: Steinsel
 Sponsor: root S.A. http://www.root.lu/
 Bandwidth: 1Gbps
 
-Site: mirror2.corbina.ru
-Type: leaf
-Archive-architecture: amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390 s390x sparc
-Archive-http: /debian/
-Updates: once
-Maintainer: mirror2.corbina.ru <bogdanov_r@corbina.ru>, mirrors@corbina.net
-Comment: bogdanov_r bounces
-Country: RU Russian Federation
-Location: MSK Corbina Telecom
-Sponsor: Corbina Telecom http://home.corbina.ru/
-
 Site: mirror.cse.iitk.ac.in
 Type: leaf
 Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
@@ -3940,15 +3930,14 @@ Bandwidth: 100Mbps
 
 Site: webb.ens-cachan.fr
 Alias: debian.ens-cachan.fr
+Alias: ftp.ens-cachan.fr
 Type: leaf
 Archive-architecture: amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390 s390x sparc
 Archive-http: /debian/
-X-CDImage-http: /debian-cd/
-Old-http: /ftp/debian-archive/
-Maintainer: Emmanuel Quemener <emmanuel.quemener@ens-cachan.fr>
-Comment: maintainer address bounces
+Maintainer: ftp@ens-cachan.fr
 Country: FR France
 Location: Ecole Normale Superieure de Cachan
+Sponsor: Ecole Normale Sup&eacute;rieure de Cachan http://www.ens-cachan.fr/
 
 Site: ftp.jaist.ac.jp
 Type: leaf
@@ -4067,19 +4056,20 @@ Sponsor: GTS Romania http://www.gtsgroup.ro/
 Sponsor: Romanian Linux Users Group http://www.lug.ro/
 Updates: once
 
-Site: ftp.corbina.net
-Alias: mirror.corbina.net
+Site: mirror.corbina.net
+Alias: ftp.corbina.net
+Alias: mirror2.corbina.ru
 Type: leaf
 Archive-architecture: amd64 i386
 Archive-http: /debian/
-Archive-rsync: debian/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
 Updates: four
-Maintainer: www.corbina.net <support@corbina.net>
+Maintainer: support@corbina.net, mirrors@corbina.net
 Country: RU Russian Federation
 Location: Moscow
 Sponsor: Corbina telecom http://www.corbina.ru/
+Country: RU Russian Federation
+Sponsor: Corbina Telecom http://home.corbina.ru/
 
 Site: opensource.nchc.org.tw
 Alias: os.nchc.org.tw
@@ -4143,6 +4133,7 @@ Archive-architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386
 Archive-http: /debian/
 X-CDImage-http: /debian-cd/
 Maintainer: Francesc Genov&eacute; Mu&ntilde;oz <francesc@genove.info>
+Comment: [2017-02] maintainer address bounces
 Country: ES Spain
 Location: Barcelona
 Sponsor: CALIU - CAtalan GNU/LInux Users http://caliu.cat/
@@ -4248,8 +4239,7 @@ Archive-http: /debian/
 Archive-rsync: debian/
 X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
-Maintainer: Ilya Ovchinnikov <ilya@psn.ru>, ftpmaster@psn.ru
-Comment: ftpmaster address bounces
+Maintainer: Ilya Ovchinnikov <ilya@psn.ru>
 Country: RU Russian Federation
 Location: Pushchino, Moscow Region
 Sponsor: Pushchino Scientific Center http://www.psn.ru/
@@ -4536,16 +4526,6 @@ Country: DE Germany
 Location: Bonn
 Sponsor: Studentenwerk Bonn http://www.stw-bonn.de
 
-Site: debian.ens-cachan.fr
-Alias: ftp.ens-cachan.fr
-Type: leaf
-Archive-architecture: amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390 s390x sparc
-Archive-http: /ftp/debian/
-X-CDImage-http: /ftp/debian-cd/
-Maintainer: ftp@ens-cachan.fr
-Country: FR France
-Sponsor: Ecole Normale Sup&eacute;rieure de Cachan http://www.ens-cachan.fr/
-
 Site: ftp-stud.hs-esslingen.de
 Type: leaf
 Archive-architecture: amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390 s390x sparc