From: Martin Zobel-Helas Date: Mon, 21 Nov 2011 19:37:33 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=78ad368b11f39122fe7819f7107c02775ea0ea7f;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: klecker does ftp-upcoming --- 78ad368b11f39122fe7819f7107c02775ea0ea7f