X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/eff0e7aa8a8e0768b14e6bb45c6c6f1ec75b4ab7..6690f1091a149a7b273d9b72c88806e5676fa185:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index aa118a6a0..53a2fbe16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   [ martin f. krafft ]
   * The meta plugin now allows for the robots tag to be specified without the
     risk of it being scrubbed.
+  * Let meta.openid set X-XRDS-Location header
+  * Make makerepo set the Git merge remote.
+    branch.master.remote previously used to default to origin, which has
+    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.
@@ -18,6 +25,12 @@ ikiwiki (2.41) UNRELEASED; urgency=low
     version 1.0.16 of Text::Markdown.
   * Updated Spanish translation from Victor Moral.
   * Fix example exclude regexp. Closes: #469691
+  * Remove locking code in git rcs_commit. I'm not sure if this was ever
+    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