From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 27 Oct 2012 12:05:11 +0000 (+0100)
Subject: Merge branch 'master' into distorted
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mirror-admin/commitdiff_plain/56e8c7af77dd4722851949e602f566c68fe15e88?hp=56e8c7af77dd4722851949e602f566c68fe15e88

Merge branch 'master' into distorted

* master:
  Keep track of the mirror target directory in an environment variable.

Conflicts:
	bin/run-mirrors
	etc/ftpsync-common.conf
---