Merge.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index da4b2a8fd..6880b0d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 	* Fix invalid SMPTE subtitle output
 	in some cases.
 
+	* Version 2.4.1 released.
+
+2015-10-06  Carl Hetherington  <cth@carlh.net>
+
 	* Speculative support for multi-part
 	bitmap subtitles (#709).
 
diff --git a/debian/changelog b/debian/changelog
index d49c6d9b0..76c9b512f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.0-1) UNRELEASED; urgency=low
+dcpomatic (2.4.1-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -322,8 +322,9 @@ dcpomatic (2.4.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 05 Oct 2015 21:13:41 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 06 Oct 2015 09:21:49 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 2b950ac82..2d7116c7a 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.0devel'
+VERSION = '2.4.1devel'
 
 def options(opt):
     opt.load('compiler_cxx')