]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Wed, 2 Feb 2011 19:24:40 +0000 (20:24 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 2 Feb 2011 19:24:40 +0000 (20:24 +0100)
commitaba2c91f63d0b34dbd5e8f89f16dcf8b79c39d9a
tree24121e9ec21dcb45fa07048e381fde23c134c23e
parent5116a1e0d4b7b1e0290539a182cfdea653be01d7
parent7b2883f31b0452fa78e97b35da53bf139c8bc7eb
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:
  new IP range for the weasel