Merge remote-tracking branch 'origin/github/pr/12'

[grml-mirrors.git] / Mirrors.masterlist

diff --git a/Mirrors.masterlist b/Mirrors.masterlist
index 0636b4a..18adc48 100644 (file)
--- a/Mirrors.masterlist
+++ b/Mirrors.masterlist
@@ -73,6 +73,16 @@ Location: Cologne
 Sponsor: NetCologne GmbH http://www.netcologne.de/
 IPv6: yes
 
+Site: ftp.fau.de
+Type: Secondary
+Grml-http: /grml/
+Grml-ftp: /grml/
+Maintainer: RRZE FTP-Admins <rrze-ftp-admins@fau.de>
+Country: DE Germany
+Location: Erlangen
+Sponsor: Friedrich-Alexander-Universitaet Erlangen-Nuernberg http://www.fau.de/
+IPv6: Yes
+
 Site: mirror.rit.edu
 Type: Secondary
 Grml-http: /grml/
@@ -176,3 +186,13 @@ Country: FI Finland
 Location: Paris
 Sponsor: Lelux.fi https://lelux.fi
 IPv6: yes
+
+Site: mirror.serverion.com
+Type: Secondary
+Grml-http: /grml/
+Grml-https: /grml/
+Maintainer: Serverion Mirror <info@serverion.com>
+Country: NL Netherlands
+Location: The Hague
+Sponsor: Serverion https://www.serverion.com
+IPv6: yes