summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-06-29 15:53:51 +0200
committerintrigeri <intrigeri@boum.org>2010-06-29 15:53:51 +0200
commit1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch)
treeedfeed77be4a56ed06095bd67eb7cbc05a1a1eca /debian
parentb225fdc44d4b3d2853db622d59aed7b59788aeec (diff)
parentbe60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff)
Merge remote branch 'upstream/master' into prv/po
Conflicts: doc/plugins/po.mdwn
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ae1d23479..15ae21a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
* Fixed some confusion and bugginess about whether
rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
(Make it relative like everything else.)
+ * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
+ and prevented actually rendering hnb files.
-- Joey Hess <joeyh@debian.org> Wed, 23 Jun 2010 15:30:04 -0400