* Improve use of svn merge, by specifying the file to merge, rather than

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5903192f37c05bbbdeffd71c1291cf38c53c8621..7a0e362d3fc5371838d0b1330d43a3b91f428fa1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ 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
   * 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

+  * 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.

 
 

- -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 18:55:45 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 19:01:27 -0500

 
 ikiwiki (1.40) unstable; urgency=low
 
 
 ikiwiki (1.40) unstable; urgency=low