From: Carl Hetherington Date: Wed, 13 May 2015 22:44:54 +0000 (+0100) Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~89^2~18 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=65274489101d5b5c503ea94d61d7ac5eb1372636 Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 --- 65274489101d5b5c503ea94d61d7ac5eb1372636