Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 31 Mar 2011 18:57:35 +0000 (20:57 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 31 Mar 2011 18:57:35 +0000 (20:57 +0200)
commit6a8598ab1f4554d1cdc98cef09b190fa23f868fa
treec7ffc1e075fbd0ed8045a60b4adc8d286cc2daae
parent39ee687fdcf0394dd0bf52bd05dd86c2691cdf2f
parente1ecc8317e544c36bd4ba52c682b71a19c5a1e7b
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