Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Tue, 16 Aug 2011 09:22:12 +0000 (10:22 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 16 Aug 2011 09:22:12 +0000 (10:22 +0100)
commit2f11b36e33721dba5d745b8a79e6382ae7f5f907
treea995e6db693ca3ebad31d37e3879836bef454a52
parente0e77e936bea84216ba389bb7f35ed289ea97456
parent688e349562efdf8cd2238c0df33c69e7115267e9
Merge branch 'master' into distorted

* master:
  Mirror Ubuntu and the Debian multimedia packages.
  Refactor the Debian mirror configuration.