]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' into backend-getauth
authorMark Zealey <mark@markandruth.co.uk>
Mon, 6 Jan 2014 14:28:15 +0000 (16:28 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Mon, 6 Jan 2014 14:28:15 +0000 (16:28 +0200)
1  2 
pdns/ueberbackend.cc

Simple merge