From: Carl Hetherington <cth@carlh.net>
Date: Wed, 1 Aug 2012 23:59:59 +0000 (+0100)
Subject: Merge branch 'master' of /home/carl/git/dvdomatic
X-Git-Tag: v2.0.48~1764^2~3
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=12afa3c2bc77b3b18c2b6766012b70e6176a817a;p=dcpomatic.git

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

12afa3c2bc77b3b18c2b6766012b70e6176a817a