From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Apr 2015 16:55:08 +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~137^2~5
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=de55fefe3f977a3552e95400c0e9f5183c14a181;hp=-c;p=dcpomatic.git

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

de55fefe3f977a3552e95400c0e9f5183c14a181