Merge pull request #3876 from rgacogne/dnsdist-response-rules-3870

author Remi Gacogne <rgacogne@users.noreply.github.com>

Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)

committer Remi Gacogne <rgacogne@users.noreply.github.com>

Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)
committer Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)
committer	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 25 May 2016 09:47:47 +0000 (11:47 +0200)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history