Merge pull request #5293 from rgacogne/rec-lua-getstat

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)

committer GitHub <noreply@github.com>

Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)
committer GitHub <noreply@github.com>
Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)
diff --cc docs/markdown/recursor/scripting.md
Simple merge
diff --cc pdns/lua-recursor4.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)
committer	GitHub <noreply@github.com>
	Sat, 13 May 2017 09:33:35 +0000 (11:33 +0200)
		1	2
docs/markdown/recursor/scripting.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-recursor4.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history