Merge master.

diff --cc ChangeLog
index 8cabafd0bf76ef787a213f2b607e968f70d34b9b,c5df3d2cc34956f3e279cad2d90de2a24ec98dca..129d148e9f76e1fb2cd97cf5afaad7557df44255
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,17 @@@
 +2013-04-24  Carl Hetherington  <cth@carlh.net>
 +
 +      * Allow use of existing empty directories for new films (without
 +      confirmation) and existing non-empty directories (with confirmation)
 +      (#124).
 +
+ 2013-04-26  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.87 released.
+ 
+ 2013-04-26  Carl Hetherington  <cth@carlh.net>
+ 
+       * Make new trim options actually work (#121).
+ 
  2013-04-23  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.86 released.