From: Carl Hetherington <cth@carlh.net>
Date: Thu, 28 Feb 2013 18:46:42 +0000 (+0000)
Subject: Merge branch 'master' into i18n
X-Git-Tag: v2.0.48~1337^2~595^2~8^2~3
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8bb4ba8f424cac07f7730fca99d5333fcd76a84d

Merge branch 'master' into i18n
---

8bb4ba8f424cac07f7730fca99d5333fcd76a84d