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

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

b8724f408298ff3e804fb821fa15d3bcded0e3db