From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 Jul 2015 23:51:06 +0000 (+0100)
Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
X-Git-Tag: v2.1.20~6
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=b7911b6da3eb53fe7a87a5abd05c20026f2d865d;hp=-c;p=dcpomatic.git

Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
---

b7911b6da3eb53fe7a87a5abd05c20026f2d865d