From: Carl Hetherington <cth@carlh.net>
Date: Mon, 22 Apr 2013 23:05:16 +0000 (+0100)
Subject: Merge branch 'bug-120'
X-Git-Tag: v2.0.48~1337^2~347^2~27
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ed34be5011aafe4ebdf42d4f6426c788d39dc5e1

Merge branch 'bug-120'
---

ed34be5011aafe4ebdf42d4f6426c788d39dc5e1