Merge master.

1 files changed, 26 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 28cd9b332..c2439f807 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,32 @@
 
 	* Add subtitle view.
 
+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>
+
+	* Version 1.69.32 released.
+
+2014-06-21  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.31 released.
+
+2014-06-20  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.30 released.
+
+2014-06-20  Carl Hetherington  <cth@carlh.net>
+
+	* Updates to de_DE translation from Carsten Kurz.
+
 2014-06-18  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.69.29 released.