From: Carl Hetherington Date: Fri, 16 Jan 2015 09:35:43 +0000 (+0000) Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~305^2~1 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d786e01fdaed5866ca72cbcf15ec5aa9a1a8fdf2 Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 --- d786e01fdaed5866ca72cbcf15ec5aa9a1a8fdf2