From: Carl Hetherington <cth@carlh.net>
Date: Wed, 22 Oct 2014 09:10:54 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~548
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2

Merge master.
---

f90d74f7a0382f0dc63eef81bd553d7a7b38edb2