From: Martin Zobel-Helas Date: Thu, 31 Mar 2011 18:57:35 +0000 (+0200) 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=6a8598ab1f4554d1cdc98cef09b190fa23f868fa;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: added "don't edit me" banner added spontini to squeeze set steffani on squeeze --- 6a8598ab1f4554d1cdc98cef09b190fa23f868fa