]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 25 Apr 2014 07:29:19 +0000 (09:29 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 25 Apr 2014 07:29:19 +0000 (09:29 +0200)

Trivial merge