Merge.

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f1e7920f..6ec63e8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2015-06-19  Carl Hetherington  <cth@carlh.net>
 
 	* Fix non-working audio analysis dialogue.
+	
+	* Version 2.1.6 released.
 
 2015-06-18  Carl Hetherington  <cth@carlh.net>
 
diff --git a/debian/changelog b/debian/changelog
index c38f14d49..a218b2573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.5-1) UNRELEASED; urgency=low
+dcpomatic (2.1.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -236,8 +236,9 @@ dcpomatic (2.1.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 18 Jun 2015 22:11:11 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 19 Jun 2015 21:00:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 7430106b7..4023ad219 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.5devel'
+VERSION = '2.1.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')