]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 23 May 2013 13:23:30 +0000 (15:23 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Thu, 23 May 2013 13:23:30 +0000 (15:23 +0200)

Trivial merge