From: Carl Hetherington <cth@carlh.net>
Date: Fri, 24 Apr 2020 14:18:37 +0000 (+0200)
Subject: Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
X-Git-Tag: v2.15.56~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=90b78d5477e4ca51b96cd22e7e81de50da486132;p=dcpomatic.git

Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
---

90b78d5477e4ca51b96cd22e7e81de50da486132