Merge master.

diff --cc ChangeLog
index b59b94c8cd70913d8a74bef9cb93ea8cdef3d621,fee8a50f3521cc1c8eb669476a126e888112d97f..61f558dcc3163a1534c7594393e62d61072ed98c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,16 +1,20 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-07-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Try to fix corruption of KDM email setting in
+       some cases.
+ 
+       * Version 1.72.1 released.
+ 
+ 2014-07-08  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix various problems with seek and content
+       being trimmed when its video frame rate is
+       overridden.
+ 
  2014-07-02  Carl Hetherington  <cth@carlh.net>
  
        * Updated de_DE translation from Carsten Kurz.

diff --cc src/lib/playlist.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge