Merge pull request #7871 from omoerbeek/calidns-openbsd

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)

committer GitHub <noreply@github.com>

Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)
committer GitHub <noreply@github.com>
Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)
diff --cc configure.ac
Simple merge
diff --cc pdns/Makefile.am
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)
committer	GitHub <noreply@github.com>
	Tue, 18 Jun 2019 08:21:19 +0000 (10:21 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history