summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-03-09 00:32:10 +0100
committerintrigeri <intrigeri@boum.org>2009-03-09 00:32:10 +0100
commitf4a1732b0e65ea4459098e4e852dff10a5af9320 (patch)
tree60b8cf4b1677504cb86f301bb62a33cc769fafd9 /debian/changelog
parentcc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff)
parent0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff)
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog12
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 801dc154f..c66db85a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-ikiwiki (3.07) UNRELEASED; urgency=low
+ikiwiki (3.07) unstable; urgency=low
* Updated German translation (Kai Wasserbäch). Closes: #518377
* Updated French translation (Jean-Luc Coulon). Closes: #518510
-
- -- Joey Hess <joeyh@debian.org> Thu, 05 Mar 2009 15:43:02 -0500
+ * wmd: New plugin contributed by William Uther to support the WMD
+ Wysiwym markdown editor.
+ * smiley: Avoid infinite loop in smiley expansion triggered
+ by the template scan mode change in version 3.05. Closes: #518805
+ * template: When loading a template in scan mode, let preprocess
+ know it only needs to scan.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 08 Mar 2009 19:00:46 -0400
ikiwiki (3.06) unstable; urgency=low