From: Carl Hetherington <cth@carlh.net>
Date: Sat, 21 Jun 2014 21:48:57 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~551^2~73
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0084e2db157939b3639e524588240db9b96bbc7d

Merge master.
---

0084e2db157939b3639e524588240db9b96bbc7d
diff --cc ChangeLog
index 22813ba55,1c8fc930b..de702dacf
--- a/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>