Merge branch 'master' into HEAD
authorMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:38:07 +0000 (11:38 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:38:07 +0000 (11:38 +0000)
* master:
  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.


Trivial merge