]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Sat, 29 Aug 2015 11:26:33 +0000 (13:26 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Sat, 29 Aug 2015 11:26:33 +0000 (13:26 +0200)

Trivial merge