From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 Jul 2012 22:37:32 +0000 (+0100)
Subject: Merge branch 'master' into wx
X-Git-Tag: v2.0.48~1879
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=80497156e0364175f9d5f8c7b14612b99dc6dc32;p=dcpomatic.git

Merge branch 'master' into wx
---

80497156e0364175f9d5f8c7b14612b99dc6dc32