Merge.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 16eabd8d4..5686be088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* 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).
 
diff --git a/debian/changelog b/debian/changelog
index 62ee8ef59..079034545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.8-1) UNRELEASED; urgency=low
+dcpomatic (2.4.9-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -330,8 +330,9 @@ dcpomatic (2.4.8-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 10 Oct 2015 18:59:39 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Oct 2015 18:37:55 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 8ee38ea4e..7da470740 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.8devel'
+VERSION = '2.4.9devel'
 
 def options(opt):
     opt.load('compiler_cxx')