Merge pull request #4116 from skoef/netmaskGroupRuleLocalAddr

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

Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)

committer GitHub <noreply@github.com>

Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)
committer GitHub <noreply@github.com>
Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsrulactions.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)
committer	GitHub <noreply@github.com>
	Fri, 19 Aug 2016 07:44:06 +0000 (09:44 +0200)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrulactions.hh	patch \|	diff1 \|	diff2 \|	blob \| history