From: Carl Hetherington <cth@carlh.net>
Date: Thu, 20 Jun 2013 20:21:31 +0000 (+0100)
Subject: Merge branch '1.0' of ssh://houllier/home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1337^2~311
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5fd5e78c51bd5630f6777001db5aa25103218c22

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

5fd5e78c51bd5630f6777001db5aa25103218c22