Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Thu, 21 Jul 2011 15:55:27 +0000 (16:55 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 21 Jul 2011 15:55:27 +0000 (16:55 +0100)
* master:
  etc/ftpsync-debian.conf: Fetch from the German mirror.
  bin/run-mirrors: Use id(1) to find current user name.
  etc/logrotate.conf: Somehow went missing.


Trivial merge