Merge branch 'master' of /home/git/mirror-monitor

diff --combined mirmon/exim_mirrors_ftp.lst
index 62765a6bdf41476ff2177a081b707a639d0016a6,3455181435c5e556af013c69e43ea9b6287021ef..834e8bf95c7a799547dec5727c8c53ff390a5905
--- 1/mirmon/exim_mirrors_ftp.lst
--- 2/mirmon/exim_mirrors_ftp.lst
+++ b/mirmon/exim_mirrors_ftp.lst
@@@ -28,11 -28,11 +28,11 @@@ fr  http://exim.mirror.fr
  hr  http://ftp.carnet.hr/misc/exim/                     # BZ1129 - joy+exim@entuzijast.net
  hr  ftp://ftp.carnet.hr/misc/exim/
  hu  http://exim-ftp.octet.hu/                           # akosgergely@gmail.com BZ739
- ie  ftp://ftp.heanet.ie/pub/exim/                       # Brian McArdle <brian.mcardle@heanet.ie> BZ527
- ie  http://ftp.heanet.ie/pub/exim/
- ie  rsync://ftp.heanet.ie/pub/exim/
+ ie  ftp://ftp.heanet.ie/pub/ftp.exim.org/               # Brian McArdle <brian.mcardle@heanet.ie> BZ527
+ ie  http://ftp.heanet.ie/pub/ftp.exim.org/
+ ie  rsync://ftp.heanet.ie/pub/ftp.exim.org/
  ##il  http://exim.vpx.co.il/ftp/                          # Down 68 days BZ1110
- kr  http://ftp.kaist.ac.kr/exim/                        # BZ1133 - ftp@ftp.kaist.ac.kr 
+ kr  http://ftp.kaist.ac.kr/exim/                        # BZ1133 - ftp@ftp.kaist.ac.kr
  kr  ftp://ftp.kaist.ac.kr/exim/
  jp  http://washitake.com/mail/exim/mirror/
  ##nl  http://mirrors-eu.spyrush.com/exim/                 # Down 82 days, BZ1043 Peter Vrzak <peter.vrzak@gmail.com>
@@@ -45,7 -45,6 +45,7 @@@ pt  ftp://mirrors.dominios.pt/pub/ftp.e
  ##ru  rsync://mirrors-ru.go-parts.com/mirrors/eximftp/    # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
  ua  http://exim.telcom.net.ua/ftp/                      # Oleksandr(Alex) Panchuk <lxadm@telcom.net.ua> BZ983
  uk  ftp://ftp.exim.org/pub/
 +uk  https://ftp.exim.org/pub/exim/
  uk  ftp://ftp.mirrorservice.org/sites/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>
  uk  http://www.mirrorservice.org/sites/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>
  uk  rsync://rsync.mirrorservice.org/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>