Merge 1.70.0-hotfix branch into master.

diff --cc ChangeLog
index 14032c101b52cf8100d6c00289940a29fe8d9aa1,65bfbe538a1b8a0da0974c22fb325486aa768869..a417575e5bf41be0b1c476923ea88e1888cd8d05
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,13 +1,24 @@@
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.71.0 released.
+ 
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix up/down buttons in content list.
+ 
  2014-06-26  Carl Hetherington  <cth@carlh.net>
  
 +      * Version 1.70.1 released.
 +
 +2014-06-26  Carl Hetherington  <cth@carlh.net>
 +
 +      * Support different KDM formulations.
 +
 +      * Allow override of detected video frame rates.
 +
 +      * Optimisation of uncertain effect to encoder and server
 +      thread handling.
 +
        * Version 1.70.0 released.
  
  2014-06-25  Carl Hetherington  <cth@carlh.net>

diff --cc debian/changelog
index 7a38ec535fbcd49f43f487d721a886bbc7b91c6f,872bd18adb6d9fb559d2863e2d74fedfc470d52e..2cb6795fa2c6ed5bdb2776850297696b9be41599
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -164,7 -164,7 +164,11 @@@ dcpomatic (1.71.0-1) UNRELEASED; urgenc
    * New upstream release.
    * New upstream release.
  
++<<<<<<< HEAD
 + -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
++=======
+  -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Jun 2014 13:25:44 +0100
++>>>>>>> 1.70.0-hotfix
  
  dcpomatic (0.87-1) UNRELEASED; urgency=low
  

diff --cc wscript
Simple merge