From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Dec 2013 17:49:51 +0000 (+0000)
Subject: Merge branch '1.0' into 1.0-seek
X-Git-Tag: v2.0.48~922^2~43
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c94f29d333e1b81aabbc396920250844460d46f6

Merge branch '1.0' into 1.0-seek
---

c94f29d333e1b81aabbc396920250844460d46f6