From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 May 2016 10:28:06 +0000 (+0100)
Subject: Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
X-Git-Tag: v1.3.4~35
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=043d382cb7360f35e97b9057045c6a255b905443;hp=-c;p=libdcp.git

Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
---

043d382cb7360f35e97b9057045c6a255b905443