Merge pull request #3962 from Habbie/openbsd

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

Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)

committer GitHub <noreply@github.com>

Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)
committer GitHub <noreply@github.com>
Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/nameserver.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)
committer	GitHub <noreply@github.com>
	Tue, 28 Jun 2016 15:13:03 +0000 (17:13 +0200)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/nameserver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history