From: Carl Hetherington <cth@carlh.net>
Date: Mon, 10 Dec 2012 23:47:34 +0000 (+0000)
Subject: Merge branch 'master' into speed-up
X-Git-Tag: v2.0.48~1417^2~3
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2247247a5294af70890cf68f3f9be930f3729d95

Merge branch 'master' into speed-up
---

2247247a5294af70890cf68f3f9be930f3729d95