Merge pull request #4301 from Habbie/lua-ds-tostring

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)

committer GitHub <noreply@github.com>

Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)
committer GitHub <noreply@github.com>
Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)
diff --cc docs/markdown/recursor/scripting.md
Simple merge
diff --cc pdns/lua-recursor4.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)
committer	GitHub <noreply@github.com>
	Thu, 11 Aug 2016 12:39:32 +0000 (14:39 +0200)
		1	2
docs/markdown/recursor/scripting.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-recursor4.cc	patch \|	diff1 \|	diff2 \|	blob \| history