Merge pull request #4951 from Habbie/netmaskgroup-negative

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

Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)

committer GitHub <noreply@github.com>

Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)
committer GitHub <noreply@github.com>
Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/test-iputils_hh.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)
committer	GitHub <noreply@github.com>
	Tue, 31 Jan 2017 16:32:48 +0000 (17:32 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/test-iputils_hh.cc	patch \|	diff1 \|	diff2 \|	blob \| history