From: Carl Hetherington <cth@carlh.net>
Date: Sun, 13 Oct 2013 12:12:19 +0000 (+0100)
Subject: Merge branch '1.0' of /Users/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1283^2
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=601001cc7abb3e69ae363dfde7c98c8ff4848b95;p=dcpomatic.git

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

601001cc7abb3e69ae363dfde7c98c8ff4848b95