From: Carl Hetherington <cth@carlh.net>
Date: Tue, 3 Dec 2019 10:21:43 +0000 (+0100)
Subject: Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
X-Git-Tag: v2.15.37~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8587a7420141a37c548b66f5383296eb5631c89d

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

8587a7420141a37c548b66f5383296eb5631c89d