cutpaste: Fix bug that occured in some cases involving inlines when text was pasted...

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

diff --git a/debian/changelog b/debian/changelog
index 46401b58cbb8b51d4cd3a860af0a982e76b89eb3..d6eebea7839ca1ac0fe2ab088060ccd02cb5457d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
   * 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.
+  * cutpaste: Fix bug that occured in some cases involving inlines when
+    text was pasted on a page before being cut.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Sep 2010 12:08:05 -0400