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)
commit34b395459496b5be881b45267379da1461aad7e4
tree5227638812e0809552d78aa5ae725694ad81e358
parent2cf69b6c7f82ccffc8928a7a8c3f8dbbadee59f3
parenta61843da3f2a729a4e1b7dee4c947b2bf1cf3802
Merge branch 'master' into distorted

* 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.