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

diff --cc bin/run-mirrors
index d13619a,9c24c7d..8fb9ccc
--- 1/bin/run-mirrors
--- 2/bin/run-mirrors
+++ b/bin/run-mirrors
@@@ -9,7 -9,8 +9,8 @@@ case $(id -un) i
  esac
  
  ## Set up a plausible environment.
 -HOME=/var/lib/mirror-admin; export HOME; cd
 -MIRRORS=/mnt/mirrors; export MIRRORS
 +HOME=/var/lib/mirror; export HOME; cd
++MIRRORS=/mnt/ftp/pub/mirrors; export MIRRORS
  PATH=$HOME/bin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin:/usr/local/sbin
  export PATH
  umask 002

diff --cc etc/ftpsync-common.conf
Simple merge