From: Carl Hetherington Date: Fri, 26 Aug 2016 10:19:56 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic X-Git-Tag: v2.9.18~8^2~1 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=234623db3306626520e06cac985eb157379eff99 Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic --- 234623db3306626520e06cac985eb157379eff99