]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@powerdns.com>
Mon, 23 Nov 2015 16:10:22 +0000 (17:10 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Mon, 23 Nov 2015 16:10:22 +0000 (17:10 +0100)

Trivial merge