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)
commit7c4825638adac8b88f656e994b079d2dd6db00ed
treeb82f7f6f15304b37c98d21480994347fca93b018
parente63c017b5366c049b29a497c07050388e8110c27
parent9b59ca1222cc7c045543b60ae7463d5c1c69588a
Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.
  etc/ftpsync-common.conf: Include Debian sources.
etc/ftpsync-common.conf