Merge pull request #954 from paboldin/bind-add-zone

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

Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)

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

Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)
author Peter van Dijk <peter@7bits.nl>
Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)
committer Peter van Dijk <peter@7bits.nl>
Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)
diff --cc pdns/backends/bind/bindbackend2.cc
Simple merge
diff --cc pdns/backends/bind/bindbackend2.hh
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)
committer	Peter van Dijk <peter@7bits.nl>
	Mon, 16 Sep 2013 10:12:41 +0000 (03:12 -0700)
		1	2
pdns/backends/bind/bindbackend2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/backends/bind/bindbackend2.hh	patch \|	diff1 \|	diff2 \|	blob \| history