From: Carl Hetherington <cth@carlh.net>
Date: Sun, 31 Aug 2014 23:10:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.0
X-Git-Tag: v2.0.48~629
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b

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

5e4f001bf32e3cdf65efa34803d70e6c1c00c66b