Merge master.

diff --cc ChangeLog
index 22813ba5579ca96f79ced547ed750332c433a732,1c8fc930be0ae00ed58216263da8e0c8ebac9d7f..de702dacf571603cbf6d457285a0748d3e9da725
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
  2014-06-21  Carl Hetherington  <cth@carlh.net>
  
 +      * Move email config into the KDM email page.
 +
+       * Version 1.69.34 released.
+ 
+ 2014-06-21  Carl Hetherington  <cth@carlh.net>
+ 
        * Version 1.69.33 released.
  
  2014-06-21  Carl Hetherington  <cth@carlh.net>