Merge pull request #5185 from rgacogne/dnsdist-nmg-add-masks

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

Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)

committer GitHub <noreply@github.com>

Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)
author bert hubert <bert.hubert@netherlabs.nl>
Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)
committer GitHub <noreply@github.com>
Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)
committer	GitHub <noreply@github.com>
	Tue, 18 Apr 2017 19:03:02 +0000 (21:03 +0200)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history