Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --cc ChangeLog
index fb7890ec653d25363344f987681a6d93167302d5,3b631c2af7c3588de9925844a41ab6bd6c0ed74c..6803804ca56ed568e93f7cab46eeb8b690562285
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,14 +1,16 @@@
+ 2017-01-04  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix non frame-aligned trims when using the to-playhead
+       buttons.
+ 
+ 2016-12-25  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updated fr_FR translation from Thierry Journet.
+ 
  2016-12-21  Carl Hetherington  <cth@carlh.net>
  
 +      * Add approximate finish time to progress on jobs (#927).
 +
        * Version 2.10.5 released.
  
  2016-12-21  Carl Hetherington  <cth@carlh.net>