Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000 (17:22 +0000)
committerPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000 (17:22 +0000)
* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  Add more IP addresses to HOST_GANETI_* variables


Trivial merge