]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
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)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  new IP range for the weasel


Trivial merge