]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/pr/2751' into run-geoip-tests
authorPieter Lexis <pieter.lexis@powerdns.com>
Wed, 16 Sep 2015 09:20:36 +0000 (11:20 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Wed, 16 Sep 2015 09:20:36 +0000 (11:20 +0200)

Trivial merge