poll vote (Accept both)

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

diff --git a/debian/changelog b/debian/changelog
index 3f649a2ce047c948c769432e9733c69ad39fee8f..59d7eb7614456872e64a3893e88b78f4456b6f19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
-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.
+  * 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
+
+ikiwiki (3.20101023) unstable; urgency=low

 
   * Fix typo that broke anonymous git push.
 
   * Fix typo that broke anonymous git push.

+  * 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
 
 
 ikiwiki (3.20101019) unstable; urgency=low