summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-17 14:06:57 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-17 14:06:57 -0500
commit613a54a3cb48ff0bd00c02d44304ce08b6725343 (patch)
treed0906f3c121113ded0c5dcb0215d3d9925a7c773 /debian
parent15ec55eff58d056704b7911d8ed3975a4f09d65c (diff)
parentf9b87a9f8b498f3a41614b159dcb278024be70dd (diff)
Merge branch 'master' into comments
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 727447023..b884dd596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ ikiwiki (2.71) UNRELEASED; urgency=low
generated.
* meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
* htmlbalance: don't compact whitespace, and set misc other options (smcv)
+ * rename: Fix double-escaping of page name in edit box.
+ * monotone: When getting the log, tell monotone how many entries
+ we want, rather than closing the pipe, which it dislikes. (thm)
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500