Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 12 Aug 2010 16:30:42 +0000 (18:30 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 12 Aug 2010 16:30:42 +0000 (18:30 +0200)
commit0f98c0170521225b1127eb893ec3efaf2c8a204a
treea370921d92aa6686a549248d9c9d63818c43a7af
parent615c9841345b2ac0c3330c65726aa89b0ad7e13b
parent0fca8564e10addc68100e3617528a0de98379cb0
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
modules/debian-org/misc/local.yaml