From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 17 Aug 2011 08:16:51 +0000 (+0100)
Subject: Merge branch 'distorted' into vampire
X-Git-Url: https://git.distorted.org.uk/~mdw/mirror-admin/commitdiff_plain/7c4825638adac8b88f656e994b079d2dd6db00ed

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.
---

7c4825638adac8b88f656e994b079d2dd6db00ed