]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'master' into nonexist-fail-bind
authorMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
commit7b80e8f7b2bb46832fe3c2c2877f97ac517a5578
treec41372d36d132520943c5aff0d9ddcbeb3938740
parent2ab7e9ac911bf46a6ebc712132d47a9071e88d0d
parentd951e52061fcee56766ea513e172e0602d5cdb41
Merge branch 'master' into nonexist-fail-bind
pdns/common_startup.cc
pdns/nameserver.cc
pdns/tcpreceiver.cc