From: Carl Hetherington Date: Thu, 16 Oct 2014 09:39:31 +0000 (+0100) Subject: Merge branch 'master' of git.carlh.net:git/dcpomatic X-Git-Tag: v2.0.48~551^2~17^2~3 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a55adfd6f1a22b00d1330e9aea1f5cf8d24bf92f Merge branch 'master' of git.carlh.net:git/dcpomatic --- a55adfd6f1a22b00d1330e9aea1f5cf8d24bf92f