]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' into so-reuseport
authorMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 06:56:59 +0000 (08:56 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 06:56:59 +0000 (08:56 +0200)
1  2 
pdns/common_startup.cc
pdns/docs/pdns.xml
pdns/nameserver.cc

Simple merge
Simple merge
Simple merge