]> 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>
Tue, 13 Mar 2012 08:54:49 +0000 (09:54 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 13 Mar 2012 08:54:49 +0000 (09:54 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  more baidu address space


Trivial merge