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

1  2 
etc/ftpsync-common.conf

Simple merge