From: Carl Hetherington <cth@carlh.net>
Date: Wed, 5 Jun 2019 20:44:29 +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.7^0
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=951d70db4f81b5ddd4093f11853637c8ecbe63c5

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

951d70db4f81b5ddd4093f11853637c8ecbe63c5