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 22:13:02 +0000 (00:13 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 22:13:02 +0000 (00:13 +0200)
commit5b8208cd226e364b9d063c0406ace9e8d09c8ea2
treec9c33b8490dcb27438a8c0eeb7517781d022ee89
parent7004f4e0ff36511fdd02d6d16ce749f32a12588e
parent3f3dc8b742124d935eaf9fb890f232f4aaaac0e1
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet