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

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 40d18368d842fe7321f410eec379eb879df9c95f..66389f3fb01d62bf35afbeabee262c398b5da0cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * 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