From: Carl Hetherington <cth@carlh.net>
Date: Thu, 29 Jan 2015 20:30:31 +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~255
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ab1eff7e045517bf8377003b1f6dc5ad22b08a5b;hp=-c

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

ab1eff7e045517bf8377003b1f6dc5ad22b08a5b