Merge master.

diff --cc ChangeLog
index d3891e82c496d7b909819b0c665d90883785d55b,a966e75328eb11056504958b02aa2a195d7bc464..b584a6c7c64154b680950dbf3ff2c24ba1e33e8d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,10 +1,37 @@@
  2014-08-29  Carl Hetherington  <cth@carlh.net>
  
 +      * Version 2.0.4 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.3 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.2 released.
 +
 +2014-08-06  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.1 released.
 +
 +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.
+       * Some improvements to the manual.
+ 
+ 2014-08-26  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.0 released.
  
  2014-08-25  Carl Hetherington  <cth@carlh.net>
  

diff --cc debian/changelog
index 99cdc4f584e257115a9bf41656bfbcdd3a4f69b8,7002c19cfa98e1f0e2afd7273139f3a73cad1673..a671a9e8dd38df8a602e17b626ab8b705cbb2b66
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +dcpomatic (2.0.4-1) UNRELEASED; urgency=low
++=======
+ dcpomatic (1.73.0-1) UNRELEASED; urgency=low
++>>>>>>> origin/master
  
    * New upstream release.
    * New upstream release.