From: Carl Hetherington <cth@carlh.net>
Date: Thu, 13 Dec 2012 21:51:26 +0000 (+0000)
Subject: Fix merge.
X-Git-Tag: v2.0.48~1438
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=4dd30112e54a59d9b14e9485725edf1d2bf1e169;p=dcpomatic.git

Fix merge.
---

4dd30112e54a59d9b14e9485725edf1d2bf1e169