Merge.

diff --cc ChangeLog
index 16eabd8d4a7da72471cde41fb2af72262c26427d,afaaf5800355203d992c41f67235da026efb7753..5686be088af8de24eb990c947d57581c4078bf42
--- 1/ChangeLog
--- 2/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).