]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 16 Mar 2012 08:10:46 +0000 (09:10 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 16 Mar 2012 08:10:46 +0000 (09:10 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  New addressrange at conova


Trivial merge