Merge branch 'master' into 1.0

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c5df3d2cc..129d148e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.