From: Carl Hetherington <cth@carlh.net>
Date: Sun, 11 Oct 2015 21:19:35 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.4.10~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=10a0dd6c5153019e0b17793c812f1653f26e0960

Merge.
---

10a0dd6c5153019e0b17793c812f1653f26e0960
diff --cc ChangeLog
index 16eabd8d4,afaaf5800..5686be088
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,12 @@@
  2015-10-11  Carl Hetherington  <cth@carlh.net>
  
 +	* Add option to log SMTP session transcripts
 +	for debugging failures to send email.
 +
+ 	* Version 2.4.9 released.
+ 
+ 2015-10-11  Carl Hetherington  <cth@carlh.net>
+ 
  	* Provide progress indication when finding
  	subtitles (#711).