Merge.

diff --cc ChangeLog
index af03d17013bb7cc79530f07f72b2c589b09b3c01,d72fd4219cb5d173d2b807be69d749935ad21831..ab9cff1e8796f4603fb26431663c7c4887d94801
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,12 @@@
  2014-04-17  Carl Hetherington  <cth@carlh.net>
  
 +      * Fix update of the gain control when using the gain calculator
 +      dialog.
 +
 +      Reported-by: Andy Neddermeyer
 +
+       * Version 1.66.12 released.
+ 
  2014-04-07  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.66.11 released.