From: Carl Hetherington <cth@carlh.net>
Date: Wed, 6 Nov 2013 16:38:00 +0000 (+0000)
Subject: Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1201
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=4c7416beb0efbf74868f756ddf8013f93c5841dc;hp=4c7416beb0efbf74868f756ddf8013f93c5841dc;p=dcpomatic.git

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