From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Jul 2015 15:05:53 +0000 (+0100)
Subject: Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
X-Git-Tag: v2.1.20~10
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8a3e92e65fd813ab587441ed3373d24067cf7bbd

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

8a3e92e65fd813ab587441ed3373d24067cf7bbd