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)
commit9b59ca1222cc7c045543b60ae7463d5c1c69588a
tree7a1bfb02ad1a99c113b48dbf842535e257dfb81b
parent623b27d76cb98b6d8808724d0ead8bbf1c7fc6a9
parent65736735a742c1b1e31aa15cca455ca6d5090ce7
Merge branch 'master' into distorted

* master:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.