Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 20:42:32 +0000 (22:42 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 20:42:32 +0000 (22:42 +0200)
commitfc8a2e887766e10b6c33a00c547049d6bf38801c
tree50e2f6b54a60bf5424251a597168e7ed0739ba12
parent0561366171545ce443bc6901460e523b504cfddb
parentd39e6c5e5fe3301b679fa93b8ae1141f66c54884
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet