]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'rel/auth-3.3' of github.com:PowerDNS/pdns into rel/auth-3.3
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 10 Jun 2013 14:14:07 +0000 (16:14 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 10 Jun 2013 14:14:07 +0000 (16:14 +0200)

Trivial merge