Merge branch 'distorted' into vampire
authorMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:44:14 +0000 (11:44 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:44:14 +0000 (11:44 +0000)
* distorted:
  etc/mirrors.d/50-rfc: Fetch RFCs from IETF; fetch IDs separately.
  etc/mirrors.d/50-debian: Actually mirror security updates.
  etc/ftpsync-common.conf: Adjust the mirror root directory.
  Move the mirror home directory to /var/lib/mirror-admin.
  Move the mirror home directory to /var/lib/mirror-admin.
  bin/run-mirrors: If we have a keytab file, log in with it.
  bin/ftpsync: New version from upstream.

Conflicts:
etc/mirrors.d/50-rfc

1  2 
bin/run-mirrors

diff --cc bin/run-mirrors
Simple merge