Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

diff --cc ChangeLog
index 7d31d592a4e3a9c15cfb3272098bb85bd1e5c22c,1a031b445a22c696969b4740989d91780e4237b9..1fc51803a7d4189d5a6ab9e295c8937c7b38f764
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2014-05-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Use libdcp::raw_convert instead of boost::lexical_cast and
 +      LocaleGuard, hopefully to fix large numbers being written with
 +      thousands separators on some locales.
 +
+ 2014-05-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.2 released.
+ 
  2014-05-10  Carl Hetherington  <cth@carlh.net>
  
        * Fix setup of the libswresample context to work with high channel counts.