]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' into so-reuseport
authorMark Zealey <mark@markandruth.co.uk>
Mon, 9 Dec 2013 11:11:49 +0000 (13:11 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Mon, 9 Dec 2013 11:11:49 +0000 (13:11 +0200)
1  2 
pdns/nameserver.cc

Simple merge