From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 May 2015 11:54:04 +0000 (+0100)
Subject: Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~93
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=0463cc5d09fd759a8ec3e40560ab8fd31c369876;hp=-c;p=dcpomatic.git

Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
---

0463cc5d09fd759a8ec3e40560ab8fd31c369876