Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 16 Mar 2011 20:04:31 +0000 (21:04 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 16 Mar 2011 20:04:31 +0000 (21:04 +0100)
commit65a9612fcfd5ee6b1ae9342da041d286407d4c1e
tree801595bb23eca4913e5fb98b0928395db5d5d631
parenta51f209bf26dbd56f1749af2a7dfbdf8af5a1f09
parentb71dd4c41d840f0a40528ba28b870aed4e65b479
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  geo1 on squeeze
  unger on squeeze
  rietz on squeeze
modules/debian-org/misc/local.yaml