Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:48:58 +0000 (17:48 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 26 Mar 2012 16:48:58 +0000 (17:48 +0100)
* master:
  bin/ftpsync: `-exclude' means something completely wrong.


Trivial merge