From: Mark Wooding Date: Mon, 10 Mar 2014 10:42:25 +0000 (+0000) Subject: Merge branch 'ftpsync' into temp X-Git-Url: https://git.distorted.org.uk/~mdw/mirror-admin/commitdiff_plain/55e2f72de08bbef5b36e549fd1671950f17e873c?hp=07b4b1190defd33efa5d807ecb3a412eb5cba71e Merge branch 'ftpsync' into temp * ftpsync: Isolate ftpsync into its own branch. ---