Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 30 Jul 2010 16:35:52 +0000 (18:35 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 30 Jul 2010 16:35:52 +0000 (18:35 +0200)
commit47d8c4d4103a37302eb9cc89fcdaffedc3d06f4d
treedd794cbc5e5ec2ed25d0f96390db294e48040962
parent5f26ae72ec984df3382248d53861e16b92d15f96
parent9cf48188d1bf9aedf5d67826be8af7b41151ce5c
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  sibelius gets ferm