poll vote (Accept both)

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

diff --git a/debian/changelog b/debian/changelog
index 2857ec482e3f593ef6f76809e3354a29f78ca9ab..59d7eb7614456872e64a3893e88b78f4456b6f19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 ikiwiki (3.20101024) UNRELEASED; urgency=low
 
   * txt: Fix display when used inside a format directive.
 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.
+  * htmltidy, sortnaturally: Add missing checkconfig hook
+    registration. Closes: #601912
+    (Thanks, Craig Lennox and Tuomas Jormola)
+  * git: Use author date, not committer date. Closes: #602012
+    (Thanks, Tuomas Jormola)

 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400