]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Sep 2014 17:28:13 +0000 (19:28 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Sep 2014 17:28:13 +0000 (19:28 +0200)

Trivial merge