Merge pull request #3060 from ahupowerdns/lua4

author bert hubert <bert.hubert@netherlabs.nl>

Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)

committer bert hubert <bert.hubert@netherlabs.nl>

Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 21 Dec 2015 21:21:21 +0000 (21:21 +0000)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history