Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 23c6dc5e38e6e49f400ecb6541888915c397db8e..7d92ad151dbf148b436c001f310eb84976e4a1fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low
   * meta: Support keywords header. Closes: #664780
     Thanks, Martin Michlmayr
   * passwordauth: Fix url in password recovery email to be absolute.
+  * httpauth: When it's the only auth method, avoid a pointless and
+    confusing signin form, and go right to the httpauthurl.
+  * rename: Allow rename to be started not from the edit page; return to
+    the renamed page in this case.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2012 14:33:14 -0400