Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 4 Jan 2010 22:02:18 +0000 (23:02 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 4 Jan 2010 22:02:18 +0000 (23:02 +0100)

Trivial merge