From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 Aug 2016 13:43:09 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.9.16~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=b42066b7d664ac322e6d2c79c5b0fa8bb0eb75c9;hp=-c;p=dcpomatic.git

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

b42066b7d664ac322e6d2c79c5b0fa8bb0eb75c9
diff --combined ChangeLog
index b0a681955,450f31e49..76a1e2e12
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,12 @@@
 +2016-08-25  c.hetherington  <cth@carlh.net>
 +
 +	* Fix silent acceptance of certificate chains where
 +	single certificates are required (#937).
 +
  2016-08-25  Carl Hetherington  <cth@carlh.net>
  
+ 	* Make burnt-in subtitle outline width configurable (#940).
+ 
  	* Updated nl_NL translation from Rob van Nieuwkerk.
  
  2016-08-24  Carl Hetherington  <cth@carlh.net>