Merge master.

diff --cc ChangeLog
index 0a1f804b93789b8ac1ad807443f0ba0f33ea22d1,884f384bbb7350c600b8baea8746da750199ddba..d25196832ee9985848b7f841895e5398dfd4f16d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,11 +1,25 @@@
 +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-08-04  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add BCC option for KDM emails.
+ 
+ 2014-07-29  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.72.5 released.
+ 
  2014-07-17  Carl Hetherington  <cth@carlh.net>
  
        * Fix corrupted text in job descriptions in some cases.

diff --cc cscript
Simple merge

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

diff --cc src/lib/config.h
index d8ac75beddd48e79fc98b3653d9f75f6c1b15c96,0ce6b8351a4b0a48d5fb3a0791112edd5edd2ba1..310d3c6f5e2ca4624761c1b22ab44fa95e85ebc6
--- 1/src/lib/config.h
--- 2/src/lib/config.h
+++ b/src/lib/config.h
@@@ -461,10 -445,8 +470,11 @@@ private
        std::string _kdm_subject;
        std::string _kdm_from;
        std::string _kdm_cc;
+       std::string _kdm_bcc;
        std::string _kdm_email;
 +      boost::shared_ptr<const dcp::Signer> _signer;
 +      dcp::Certificate _decryption_certificate;
 +      std::string _decryption_private_key;
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;

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

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

diff --cc src/wx/config_dialog.cc
index 8e27dc540856829651788014866674e54a335112,234ac319dfa0947068083c3f666cd33a3c126b96..175ed94ade131a754781e69476f9d6d6f4f3a534
--- 1/src/wx/config_dialog.cc
--- 2/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@@ -1006,9 -697,13 +1006,13 @@@ public
                add_label_to_sizer (table, panel, _("CC address"), true);
                _kdm_cc = new wxTextCtrl (panel, wxID_ANY);
                table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+ 
+               add_label_to_sizer (table, panel, _("BCC address"), true);
+               _kdm_bcc = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
                
                _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
 -              s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
 +              s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
  
                _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
                s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);