Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Jun 2010 09:16:01 +0000 (11:16 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Jun 2010 09:16:01 +0000 (11:16 +0200)
commit5244957c0cd8b29cd15fc7cd55dc996dbb9ced3a
treefcd26c4cfbc81b937e292afdaedee09b52089261
parent17435cfa3bab96c9f5c74e95abcf7aabc6d9e920
parentd57f1880c4260ae808e58e011bd6bb2f4f27df17
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet