From: Carl Hetherington <cth@carlh.net>
Date: Fri, 26 Apr 2013 22:49:54 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~1337^2~347^2~20
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=87a709a4ea5dffaadaf35ef94edb4b578eb3b56c;hp=87a709a4ea5dffaadaf35ef94edb4b578eb3b56c;p=dcpomatic.git

Merge master.
---