Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Feb 2011 09:59:04 +0000 (10:59 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Feb 2011 09:59:04 +0000 (10:59 +0100)
commit5a85edf888d50e8f3714827c0624dcf15192ee1e
treea23c10c32206d38becc4ce49c34a7f79ca9f25a9
parent2fbe564870cb94327096af0d7a0b4b06d4199b24
parent6cfa780bba7f11dd6d63ed662de964e50f120825
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:
  rossini going to squeeze
modules/debian-org/misc/local.yaml