From: Carl Hetherington <cth@carlh.net>
Date: Fri, 27 Dec 2013 21:16:40 +0000 (+0000)
Subject: Merge branch '1.0' into 1.0-seek
X-Git-Tag: v2.0.48~922^2~24
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279

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

ec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279