From: Carl Hetherington <cth@carlh.net>
Date: Wed, 20 May 2015 15:29:25 +0000 (+0100)
Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~89
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6f0a590bc3266f21ba577116219bd019e891d480

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

6f0a590bc3266f21ba577116219bd019e891d480