From: Carl Hetherington <cth@carlh.net>
Date: Fri, 7 Nov 2014 13:35:34 +0000 (+0000)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~499
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6c9cbc74a656257e5cd7f1901439dd22256faf96;hp=--cc;p=dcpomatic.git

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

6c9cbc74a656257e5cd7f1901439dd22256faf96