Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 21 Jul 2009 14:44:12 +0000 (16:44 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 21 Jul 2009 14:44:12 +0000 (16:44 +0200)

Trivial merge