From: Carl Hetherington <cth@carlh.net>
Date: Thu, 10 Dec 2015 11:52:25 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.6.6~10
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6648949ce34a6fc2b3abe2f1c28848fe6e59dcbd;p=dcpomatic.git

Merge.
---

6648949ce34a6fc2b3abe2f1c28848fe6e59dcbd
diff --cc ChangeLog
index 75b76db31,4ac542564..a528350be
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2015-12-10  Carl Hetherington  <cth@carlh.net>
 +
 +	* Put ISDCF name subtitle language in lower case if all subs are
 +	burnt into the image.
 +
+ 2015-12-09  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 2.6.5 released.
+ 
  2015-12-08  Carl Hetherington  <cth@carlh.net>
  
  	* Version 2.6.4 released.