From: Carl Hetherington <cth@carlh.net>
Date: Wed, 19 Jun 2013 17:42:55 +0000 (+0100)
Subject: Merge branch 'master' of /home/carl/git/dvdomatic
X-Git-Tag: v2.0.48~1337^2~302^2~52
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=45a3601cfcd342ff8e8b0a256f01136879b26993;p=dcpomatic.git

Merge branch 'master' of /home/carl/git/dvdomatic
---

45a3601cfcd342ff8e8b0a256f01136879b26993