chiark / gitweb /
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)
* ftpsync:
  New ftpsync upstream.

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


Trivial merge