Merge pull request #3766 from rgacogne/packetparser-min-offset

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

Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)

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

Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)
committer Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)
diff --cc pdns/dnsname.cc
Simple merge
diff --cc pdns/dnsparser.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)
committer	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 28 Apr 2016 08:29:37 +0000 (10:29 +0200)
		1	2
pdns/dnsname.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsparser.cc	patch \|	diff1 \|	diff2 \|	blob \| history