git: When updating from remote, use git pull --prune, to avoid possible errors from...

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0eb5810d00dfce11dd64b0039d577896c2eed03d..27e0fb1033f8f75345891695ced03d35f8c12cb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
   * blueview: Fix display of links to translated pages in the page header.
   * Set isPermaLink="no" for guids in rss feeds. 
   * blogspam: Fix crash when content contained utf-8.
+  * external: Disable RPC::XML's "smart" encoding, which sent ints
+    for strings that contained only a number, fixing a longstanding crash
+    of the rst plugin.
+  * git: When updating from remote, use git pull --prune, to avoid possible
+    errors from conflicting obsolete remote branches.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Sep 2010 12:08:05 -0400