Merge branch 'ftpsync' into temp
authorMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:42:25 +0000 (10:42 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 10 Mar 2014 10:42:25 +0000 (10:42 +0000)
* ftpsync:
  Isolate ftpsync into its own branch.


Trivial merge