]> granicus.if.org Git - pdns/commitdiff
sorry Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 30 Oct 2014 13:08:54 +0000 (14:08 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Thu, 30 Oct 2014 13:08:54 +0000 (14:08 +0100)

Trivial merge