]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39ee687 e1ecc83)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.