Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:49:15 +0000 (10:49 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:49:15 +0000 (10:49 +0000)
* master:
  New ftpsync upstream.
  bin/fetch-ftpsync: Add a script to update the `ftpsync' machinery.
  lib/functions.sh: Tweak rsync options somewhat.
  Isolate ftpsync into its own branch.


Trivial merge