From: Carl Hetherington <cth@carlh.net>
Date: Sun, 10 May 2015 01:49:17 +0000 (+0100)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~89^2~44
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=41a2ba154e60f03da08b28e7273776e7bfe9dbe0;hp=-c;p=dcpomatic.git

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

41a2ba154e60f03da08b28e7273776e7bfe9dbe0