Merge pull request #891 from mind04/stat

author Peter van Dijk <peter@7bits.nl>

Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)

committer Peter van Dijk <peter@7bits.nl>

Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)
author Peter van Dijk <peter@7bits.nl>
Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)
committer Peter van Dijk <peter@7bits.nl>
Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)
diff --cc pdns/nameserver.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)
committer	Peter van Dijk <peter@7bits.nl>
	Tue, 9 Jul 2013 06:09:39 +0000 (23:09 -0700)
		1	2
pdns/nameserver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history