From: Carl Hetherington <cth@carlh.net>
Date: Mon, 29 Apr 2013 13:46:27 +0000 (+0100)
Subject: Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1337^2~409
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2cc2dc2aeaec62a4983991170fc5368e10d21748

Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
---

2cc2dc2aeaec62a4983991170fc5368e10d21748