From: Carl Hetherington Date: Tue, 16 May 2017 08:59:06 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic X-Git-Tag: v2.11.6~39 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=936cd11b4c46f99ca5fe4d960cedfb05c82dbccf Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic --- 936cd11b4c46f99ca5fe4d960cedfb05c82dbccf