]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 29 Aug 2014 13:52:12 +0000 (15:52 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 29 Aug 2014 13:52:12 +0000 (15:52 +0200)

Trivial merge