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

diff --cc ChangeLog
index 3454e1da69138437f28cc657d6d6b8e046159f02,05a615294dc216d094d47965f9a0fba695371665..38d2911452c2742314017ce47ee3400864804a5c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2014-05-16  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix various confusions in translations of abbreviated
 +      channel names (Lc, Rc etc.)
 +
+ 2014-05-14  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.7 released.
+ 
  2014-05-14  Carl Hetherington  <cth@carlh.net>
  
        * Bump libdcp to remove checks on PCM MXF edit rates,