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

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 562816083d7065bae238b5c504940a486e78fa19..66389f3fb01d62bf35afbeabee262c398b5da0cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
 ikiwiki (3.20110716) UNRELEASED; urgency=low
 
-  * mercurial: openid nicknames are now used when committing. (Daniel Andersson)
-  * mercurial: implement rcs_commit_staged so comments, attachments, etc
+  * mercurial: Openid nicknames are now used when committing. (Daniel Andersson)
+  * mercurial: Implement rcs_commit_staged so comments, attachments, etc
     can be used. (Daniel Andersson)
-  * mercurial: fix viewing of a diff containing non-utf8 changes.
+  * mercurial: Implement rcs_rename, rcs_remove. (Daniel Andersson)
+  * mercurial: Fix viewing of a diff containing non-utf8 changes.
     (Daniel Andersson)
   * mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
+  * mercurial: Implement rcs_diff. (Daniel Andersson)
+  * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
+  * Fix typo in Danish translation of shortcuts page that caused expoentional
+    regexp blowup.
+  * Fix escaping of html entities in permalinks.
+  * Fix escaping of html entities in tag names.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400