Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Wed, 17 Aug 2011 08:16:31 +0000 (09:16 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 17 Aug 2011 08:16:31 +0000 (09:16 +0100)
* master:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.


Trivial merge