Merge.

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index af03d1701..ab9cff1e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 	Reported-by: Andy Neddermeyer
 
+	* Version 1.66.12 released.
+
 2014-04-07  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.11 released.
diff --git a/debian/changelog b/debian/changelog
index e4c7a71e4..2cdcad0b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.11-1) UNRELEASED; urgency=low
+dcpomatic (1.66.12-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -115,8 +115,9 @@ dcpomatic (1.66.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 07 Apr 2014 19:59:18 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 17 Apr 2014 10:17:09 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index a2d206500..660e13c68 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.66.11devel'
+VERSION = '1.66.12devel'
 
 def options(opt):
     opt.load('compiler_cxx')