]> granicus.if.org Git - pdns/commit
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)
commitfe4883ef1b2e76e09d0ce7d2df5022a0e734fc44
treee4a05f6023b815948dd2fabd12daba7ac2920c90
parent3a56adcc8b9e18aaf56cee75df0eaa15d48a6db4
parentd951e52061fcee56766ea513e172e0602d5cdb41
Merge branch 'master' into so-reuseport
pdns/common_startup.cc
pdns/docs/pdns.xml
pdns/nameserver.cc