Merge master.

1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8cabafd0b..129d148e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
 	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.