From: Evan Hunt <each@isc.org>
Date: Wed, 14 Mar 2018 21:41:56 +0000 (-0400)
Subject: Merge branch 'branchsync' into 'master'
X-Git-Tag: v9.13.0~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9e34348266224a2aaece04a8c609ede6f6e02b6;p=thirdparty%2Fbind9.git

Merge branch 'branchsync' into 'master'

update branchsync to deal with merge commits

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

f9e34348266224a2aaece04a8c609ede6f6e02b6