Merge branch 'ftpsync'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:48:24 +0000 (10:48 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:48:24 +0000 (10:48 +0000)
commita61843da3f2a729a4e1b7dee4c947b2bf1cf3802
tree244ac7646cbdcd3c33685ca15ed14fd89ff709d0
parentd206ccfed7f74623280695492b1a9240579203dd
parent2e267ae8659832e97f23b78eeab6eaf793f60e19
Merge branch 'ftpsync'

* ftpsync:
  New ftpsync upstream.

Conflicts:
bin/ftpsync: `-excludes' -> `--excludes' now upstream