From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Sep 2014 14:44:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.0
X-Git-Tag: v2.0.48~603
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f4030653da8f5a0b3daebe640f485b3daf9ef091

Merge remote-tracking branch 'origin/master' into 2.0
---

f4030653da8f5a0b3daebe640f485b3daf9ef091