Merge branch 'distorted' into vampire vampire
authorMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:52:30 +0000 (17:52 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:52:30 +0000 (17:52 +0100)
commita4422ab54069df898d8e6fb57f55c38ecd75cb56
tree723d68b8d44fb28aa25dc91bf6780cf4c1f10807
parentdb1a5606b2f45017fc9322fee506279e8ff39b04
parent0b16568bccd8a08e2d09c10e88f4a812cb55ceab
Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: No updates for `oldstable'.
  bin/ftpsync: `-exclude' means something completely wrong.