Merge pull request #5235 from ahupowerdns/dnsdist-qnamerule

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

Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)
author bert hubert <bert.hubert@netherlabs.nl>
Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Apr 2017 09:06:12 +0000 (11:06 +0200)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history