From: Carl Hetherington Date: Thu, 29 Aug 2013 22:22:12 +0000 (+0100) Subject: Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0 X-Git-Tag: v2.0.48~1337^2~21 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7b721e7bfe0dd35957c8f56b7ec430aa21114971 Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0 --- 7b721e7bfe0dd35957c8f56b7ec430aa21114971