From: Peter Palfrader Date: Thu, 17 Feb 2011 10:11:12 +0000 (+0100) Subject: Merge remote branch 'ganneff/master' X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7738e92cf3b448a3ec4a185ab0593a3341ad1fe8;p=mirror%2Fdsa-puppet.git Merge remote branch 'ganneff/master' * ganneff/master: ries no ftphost, put morricone into it (has backports). also allow archvsync runmirrors on SECHOSTS for dak Signed-off-by: Peter Palfrader --- 7738e92cf3b448a3ec4a185ab0593a3341ad1fe8