Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Sat, 27 Oct 2012 12:05:11 +0000 (13:05 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 27 Oct 2012 12:08:28 +0000 (13:08 +0100)
commit56e8c7af77dd4722851949e602f566c68fe15e88
tree58edbf51863462983b1fb1dff20d95768fa7f7d3
parent1639fdf7bc2705132ebe1f501338a9d8cc7048dc
parent43d42398bcc186ec5f2fed6bc400b818607cdafa
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
bin/run-mirrors
etc/ftpsync-common.conf