From: Peter Palfrader Date: Fri, 30 Jul 2010 16:35:52 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=47d8c4d4103a37302eb9cc89fcdaffedc3d06f4d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: sibelius gets ferm --- 47d8c4d4103a37302eb9cc89fcdaffedc3d06f4d