X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/72dbbe3a2cc3550a2aaaf226fd561c0d5064b5b4..e220fbf35d727dca7ed835f797be89381afc873c:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 5903192f3..cd134a2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,15 @@ ikiwiki (1.41) UNRELEASED; urgency=low
   * Fix handling of discussion links on discussion pages when l10n is used.
   * Make gitorigin_branch and gitmaster_branch configurable via the setup
     file. Closes: #408599
-
- -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 18:55:45 -0500
+  * French translation update. Closes: #408593
+  * Improve use of svn merge, by specifying the file to merge, rather than
+    chdiring to the srcdir (which wasn't right when merging in a subdir).
+    Thanks Ethan.
+  * Always call rcs_update after a commit during a web edit, to work around
+    the problem described in bugs/svn_fails_to_update. Thanks to Ethan for the
+    analysis and patch.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 19:18:27 -0500
 
 ikiwiki (1.40) unstable; urgency=low