From: Matthijs Mekking <matthijs@isc.org>
Date: Mon, 18 Mar 2019 10:46:01 +0000 (-0400)
Subject: Merge branch 'revert-0d379587' into 'master'
X-Git-Tag: v9.15.0~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3fb2c4c7733a4372ade1ed3e226fa8ab4980634;p=thirdparty%2Fbind9.git

Merge branch 'revert-0d379587' into 'master'

Revert "Merge branch 'placeholder-5889' into 'master'"

See merge request isc-projects/bind9!1703
---

c3fb2c4c7733a4372ade1ed3e226fa8ab4980634