From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Feb 2014 17:39:25 +0000 (+0000)
Subject: Merge master.
X-Git-Tag: v2.0.48~905
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=58588c485eac7c488a574fe923576f109ec0134e

Merge master.
---

58588c485eac7c488a574fe923576f109ec0134e