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)
* master:
  Mirror Ubuntu and the Debian multimedia packages.
  Refactor the Debian mirror configuration.


Trivial merge