merged; notes

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

diff --git a/debian/changelog b/debian/changelog
index 8013e5cdd67571e99ea6bb2eb93f111113560c18..0f6a7c810609032e8a35e16eb33db2c4b5951128 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20100705) UNRELEASED; urgency=low
+ikiwiki (3.20100723) UNRELEASED; urgency=low
+
+  * template: Fix dependency tracking. Broken in version 3.20100427.
+  * po: The po_slave_languages setting is now a list, so the order of
+    translated languages can be controlled. (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
+
+ikiwiki (3.20100722) unstable; urgency=low
 
   * img: Add a margin around images displayed by this directive.
   * comments: Added commentmoderation directive for easy linking to the
@@ -20,11 +28,11 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     the caching problem that was added to work around). Closes: #588623
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
-  * Updated French program translation from Philippe Batailler. Closes: #589423
+  * Updated French translation from Philippe Batailler. Closes: #589423
   * po: Fix selflink display on tranlsated pages. (intrigeri)
   * Avoid showing 'Add a comment' link at the bottom of the comment post form.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Jul 2010 16:49:05 -0400
 
 ikiwiki (3.20100704) unstable; urgency=low