From: Carl Hetherington <cth@carlh.net>
Date: Fri, 24 Apr 2015 21:26:26 +0000 (+0100)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~137^2~2
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2898a88b4554335439891d8198bed8c820c20396

Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
---

2898a88b4554335439891d8198bed8c820c20396