X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cdf88c88216c75051e2e3cfc7844da4611e7c89b..43056e68d53e5fc6c000540b289bbfa2c7b037a5:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index bd72e9fc0..53a2fbe16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low
     recently been changed; it now needs to be set explicitly, which this
     patch does. Closes: #470517
   * meta: Also generate openid2 headers.
+  * Handle SimpleXMLRPCDispatcher arg count change in python 2.5
 
   [ Joey Hess ]
   * Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.
@@ -28,6 +29,8 @@ ikiwiki (2.41) UNRELEASED; urgency=low
     correct, and it's certianly not correct now, since the wiki is locked
     before rcs_commit is ever called, and should not be unlocked by
     rcs_commit either.
+  * monotone: Require version 0.38 or greater, and stop using the mtnmergerc
+    option. (Brian May)
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100