Merge pull request #1274 from cmouse/meta-interface-change

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

Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)

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

Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)
author Peter van Dijk <peter@7bits.nl>
Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)
committer Peter van Dijk <peter@7bits.nl>
Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)
diff --cc pdns/docs/pdns.xml
Simple merge
diff --cc pdns/pdnssec.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)
committer	Peter van Dijk <peter@7bits.nl>
	Fri, 14 Feb 2014 11:23:22 +0000 (12:23 +0100)
		1	2
pdns/docs/pdns.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnssec.cc	patch \|	diff1 \|	diff2 \|	blob \| history