From: Mark Wooding Date: Wed, 17 Aug 2011 08:16:31 +0000 (+0100) Subject: Merge branch 'master' into distorted X-Git-Url: https://git.distorted.org.uk/~mdw/mirror-admin/commitdiff_plain/9b59ca1222cc7c045543b60ae7463d5c1c69588a Merge branch 'master' into distorted * master: etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental. --- 9b59ca1222cc7c045543b60ae7463d5c1c69588a