Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

author Carl Hetherington <cth@carlh.net>

Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)

committer Carl Hetherington <cth@carlh.net>

Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)
author Carl Hetherington <cth@carlh.net>
Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)
committer Carl Hetherington <cth@carlh.net>
Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)
diff --cc TO_PORT

index c70ad26984f0ffb1bb73a3535a13efe0ba3956d0,29155e0218a60d141b1746c5606c5b9359c74520..5abbb0f6598cf1c64528214ccdcc87a72b47483f
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,4 -1,4 +1,5 @@@
   e6c9d208c52fb6f8bc29469e7d263bd03b22fe48
   31894d178c8f6a3378b1c25c7ea1971f78759156
+ bb2bdf010dd2ea813f9ac7af5023ce39cf14f572
   c065accc4b4c6ed268e7fccea77a958473be7785
+ +e30fd8d
author	Carl Hetherington <cth@carlh.net>
	Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)
committer	Carl Hetherington <cth@carlh.net>
	Mon, 16 Feb 2015 15:54:43 +0000 (15:54 +0000)