Merge remote branch 'remotes/origin/master'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b304e4b8645ffb33017784913787733e4f430bf7..f6ca122a00520afc7d326a28c62d92a3422581a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.