Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 18:30:46 +0000 (20:30 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 18:30:46 +0000 (20:30 +0200)
commit0d2aba01420aebfc7c5644374ca1034301585bbd
tree05671f66be594b40f6567dcec8057325e563cf78
parentda2e75d8f6154337023fe011a12d964964d0aea7
parentf6905ea2b3d60ce0d6ad0c72a6a41268ed025fd5
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet