From: Carl Hetherington <cth@carlh.net>
Date: Thu, 29 Aug 2013 11:11:56 +0000 (+0100)
Subject: Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1337^2~29
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=934e2522589c5955092e6be003c4c13381fb3c34;hp=-c;p=dcpomatic.git

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

934e2522589c5955092e6be003c4c13381fb3c34