Merge.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 79dc5997e..3191b89b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Add option to auto-upload to TMS (#794).
 
+	* Version 2.6.22 released.
+
+2016-02-16  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.6.21 released.
 
 2016-02-15  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 61b6d853b..16cde887b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.21-1) UNRELEASED; urgency=low
+dcpomatic (2.6.22-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -378,8 +378,9 @@ dcpomatic (2.6.21-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 16 Feb 2016 00:26:29 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 16 Feb 2016 10:50:13 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index d83a381a3..8c1675791 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.21devel'
+VERSION = '2.6.22devel'
 
 def options(opt):
     opt.load('compiler_cxx')