From: Carl Hetherington <cth@carlh.net>
Date: Thu, 27 Jun 2013 18:03:45 +0000 (+0100)
Subject: Merge branch 'test-fixes'
X-Git-Tag: v2.0.48~1337^2~302^2~26
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3d48669c9cba480cf83775cafd2a66033007c030

Merge branch 'test-fixes'
---

3d48669c9cba480cf83775cafd2a66033007c030