]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 21 May 2013 19:14:05 +0000 (21:14 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 21 May 2013 19:14:05 +0000 (21:14 +0200)

Trivial merge