From: Carl Hetherington <cth@carlh.net>
Date: Thu, 28 Nov 2013 23:20:32 +0000 (+0000)
Subject: Merge branch '1.0' into 1.0-generated-control
X-Git-Tag: v2.0.48~1108^2
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=747fc9e02cb66fb965e23a4cc0464cf7e8bd743d

Merge branch '1.0' into 1.0-generated-control
---

747fc9e02cb66fb965e23a4cc0464cf7e8bd743d