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

Merge branch 'master' into i18n
---

62365221dd3cd80d6b771e9bf22b4f9365ee096a