From: Carl Hetherington <cth@carlh.net>
Date: Tue, 30 Sep 2014 19:40:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.0
X-Git-Tag: v2.0.48~572
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=3b48d5494c3cae7743d283203f5c8021860ab81f;hp=--cc;p=dcpomatic.git

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

3b48d5494c3cae7743d283203f5c8021860ab81f