Merge pull request #1641 from mind04/sig-cache

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

Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)

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

Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)
author Peter van Dijk <peter@7bits.nl>
Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)
committer Peter van Dijk <peter@7bits.nl>
Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/docs/pdns.xml
Simple merge
diff --cc pdns/pdns.conf-dist
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)
committer	Peter van Dijk <peter@7bits.nl>
	Tue, 29 Jul 2014 12:44:36 +0000 (14:44 +0200)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/docs/pdns.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns.conf-dist	patch \|	diff1 \|	diff2 \|	blob \| history