X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d2359d50cab3647bfec8fc2c3147a9af2c4ecd67..5c6eb167b8e69e0607330f06c893a73dfe1c675a:/debian/changelog?ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index cee42dc85..f6ca122a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-ikiwiki (3.20101020) UNRELEASED; urgency=low
+ikiwiki (3.20101024) UNRELEASED; urgency=low
+
+  * txt: Fix display when used inside a format directive.
+  * highlight: Ensure that other, more-specific format plugins,
+    like txt are used in preference to this one in case of ties.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
+
+ikiwiki (3.20101023) unstable; urgency=low
 
   * Fix typo that broke anonymous git push.
-  * fix web reversion when the srcdir is in a subdir of the git repo.
+  * Fix web reversion when the srcdir is in a subdir of the git repo.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 15:25:19 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 16:36:50 -0400
 
 ikiwiki (3.20101019) unstable; urgency=low