From: Carl Hetherington <cth@carlh.net>
Date: Thu, 18 Apr 2013 22:23:37 +0000 (+0100)
Subject: Merge branch 'master' into staging
X-Git-Tag: v2.0.48~1337^2~347^2~51
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=fd4a97a14e74cfe2544050e8c3ffe9ce6f3aee7e;p=dcpomatic.git

Merge branch 'master' into staging
---

fd4a97a14e74cfe2544050e8c3ffe9ce6f3aee7e