From: Carl Hetherington <cth@carlh.net>
Date: Fri, 28 Sep 2012 12:17:15 +0000 (+0100)
Subject: Merge branch 'ubuntu-build'
X-Git-Tag: v2.0.48~1720^2
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c252cb33a3ca8088fbe091af903a77ad8a098969

Merge branch 'ubuntu-build'
---

c252cb33a3ca8088fbe091af903a77ad8a098969