]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' into backend-getauth
authorMark Zealey <mark@markandruth.co.uk>
Mon, 13 Jan 2014 10:23:03 +0000 (12:23 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Mon, 13 Jan 2014 10:23:03 +0000 (12:23 +0200)
1  2 
pdns/dnsbackend.hh

Simple merge