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)
commit09ffe276ba951552c757602fccb3017b20e91fd9
treeb094eb2496d6dcdb1792988b53060cd066c446c8
parent1294d4a0d20d258dff65142449e18190487b01d6
parent40931e2681c61042b8cb7bf68ebb14ef0463f1d4
Merge branch 'master' into distorted

* master:
  bin/ftpsync: `-exclude' means something completely wrong.