Merge branch 'distorted' into vampire vampire
authorMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:52:30 +0000 (17:52 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:52:30 +0000 (17:52 +0100)
* distorted:
  etc/ftpsync-debian-security.conf: No updates for `oldstable'.
  bin/ftpsync: `-exclude' means something completely wrong.


Trivial merge