Merge branch 'master' into nonexist-fail-bind

author Mark Zealey <mark@markandruth.co.uk>

Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)

committer Mark Zealey <mark@markandruth.co.uk>

Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
author Mark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
committer Mark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/nameserver.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Mark Zealey <mark@markandruth.co.uk>
	Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
committer	Mark Zealey <mark@markandruth.co.uk>
	Fri, 3 Jan 2014 08:44:44 +0000 (10:44 +0200)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/nameserver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history