From: Carl Hetherington Date: Thu, 15 Jan 2015 09:40:52 +0000 (+0000) Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~305^2~13 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=092e773f9e35c230b618bf8a3caa8259473a420b;p=dcpomatic.git Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 --- 092e773f9e35c230b618bf8a3caa8259473a420b