]> 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>
Mon, 18 Jan 2010 20:37:54 +0000 (21:37 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 18 Jan 2010 20:37:54 +0000 (21:37 +0100)

Trivial merge