]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@ftbfs.de>
Tue, 30 Jun 2009 16:12:42 +0000 (18:12 +0200)
committerMartin Zobel-Helas <zobel@ftbfs.de>
Tue, 30 Jun 2009 16:12:42 +0000 (18:12 +0200)

Trivial merge