Merge commit 'upstream/master' into pub/master

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

diff --git a/debian/changelog b/debian/changelog
index ef46370d6273286c4fb3842c2a6d9965cd6823c0..2256c24fd7d7ea46ff3c46b4d472378f7d9f62b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 ikiwiki (2.71) UNRELEASED; urgency=low
 
   * htmlbalance: New plugin contributed by Simon McVittie.
 ikiwiki (2.71) UNRELEASED; urgency=low
 
   * htmlbalance: New plugin contributed by Simon McVittie.

+  * Change deb dependencies to list Text::Markdown before markdown (really
+    this time).
+  * Improve escaping of wikilinks and preprocessor directives in content
+    produced by aggregate and recentchanges.
+  * French translation update from Philippe Batailler. Closes: #506250

 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500