From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 10 Mar 2014 10:48:24 +0000 (+0000)
Subject: Merge branch 'ftpsync'
X-Git-Url: https://git.distorted.org.uk/~mdw/mirror-admin/commitdiff_plain/a61843da3f2a729a4e1b7dee4c947b2bf1cf3802

Merge branch 'ftpsync'

* ftpsync:
  New ftpsync upstream.

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

a61843da3f2a729a4e1b7dee4c947b2bf1cf3802