From: Carl Hetherington <cth@carlh.net>
Date: Mon, 22 Sep 2014 22:05:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.0
X-Git-Tag: v2.0.48~578
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b56bc3c45953fe113a9934b0d2ec2c1134de07ab

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

b56bc3c45953fe113a9934b0d2ec2c1134de07ab