Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 25 May 2009 15:06:17 +0000 (17:06 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 25 May 2009 15:06:17 +0000 (17:06 +0200)

Trivial merge