]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000 (12:02 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000 (12:02 +0200)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  we want the output


Trivial merge