From: Ondřej Surý <ondrej@isc.org>
Date: Fri, 16 Apr 2021 11:12:19 +0000 (+0000)
Subject: Merge branch '2623-9-16-13-overwrites-master-files-if-old-format-jnl-files-are-presen... 
X-Git-Tag: v9.17.13~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ab099aa3b93744a5051b84f2705fbb0fa2e8a8d;p=thirdparty%2Fbind9.git

Merge branch '2623-9-16-13-overwrites-master-files-if-old-format-jnl-files-are-present' into 'main'

Resolve "9.16.13 overwrites master files if old format .jnl files are present"

Closes #2623

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

1ab099aa3b93744a5051b84f2705fbb0fa2e8a8d