Merge remote-tracking branch 'origin/master' into 2.0

diff --cc ChangeLog
index 68383d39dff7be7c3031e88633b3da2155a5b74e,a810461116d18e82581d27e26feeea63c2d98e3b..561bbce1c06f1ce981512e41413408902d952f8a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,7 +1,21 @@@
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +      * A variety of changes were made on the 2.0 branch
 +      but not documented in the ChangeLog.  Most sigificantly:
 +
 +      - DCP import
 +      - Creation of DCPs with proper XML subtitles
 +      - Import of .srt and .xml subtitles
 +      - Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
  2014-07-16  Carl Hetherington  <cth@carlh.net>
  
+       * Make KDM email subject configurable.
+ 
        * Updates to de_DE from Carsten Kurz.
  
        * Limit allowed KDM types based on Interop/SMPTE setting

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

diff --cc src/lib/config.h
Simple merge

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

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