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)
commite0e77e936bea84216ba389bb7f35ed289ea97456
tree70f9f842b94a7191943e0fb941bbe605a60b4290
parent0039f425876c5068c5ca14bb7b53efd296175ade
parent2391715a287fdfa2cc0a1893ff638f7fc85a00b0
Merge branch 'master' into distorted

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