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)
commitd1f30023f9e1ea8a127f2539cfd9084869a0fc0e
tree8db447d9f181bcde4f1bd846b38fc402ea95895b
parent9b59ca1222cc7c045543b60ae7463d5c1c69588a
parent0f8f73ed9f04fb478ccd15449c259f553be44f37
Merge branch 'master' into HEAD

* 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.