Merge pull request #2540 from cmouse/gss-tsig

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

Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)

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

Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)
committer Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/misc.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)
committer	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 28 May 2015 17:31:46 +0000 (19:31 +0200)
		1	2
pdns/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	patch \|	diff1 \|	diff2 \|	blob \| history