From: Carl Hetherington Date: Thu, 2 Oct 2014 23:07:54 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into 2.0 X-Git-Tag: v2.0.48~561 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4 Merge remote-tracking branch 'origin/master' into 2.0 --- c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4