summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-27 11:43:47 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-27 11:43:47 -0400
commitddef0d3170b1543e6ed580c7ce00849e3ed1550f (patch)
tree96aa1fbcdcb627d4e3cc131f0ec098119eb7acfe /debian/changelog
parent9d00f9dfcd5bc55760a19ca476499e3f64a5fe37 (diff)
parent3ce00b118e9a5f895a295f2a8382959b194e80bf (diff)
Merge branch 'master' into autoconfig
Conflicts: debian/changelog doc/todo/color_plugin.mdwn
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e146bf8d4..865544786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
-ikiwiki (2.55) UNRELEASED; urgency=low
+ikiwiki (2.55) unstable; urgency=low
* remove: New plugin that adds the ability to remove pages via the web.
(Sponsored by The TOVA Company.)
@@ -48,7 +48,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
* toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
* cutpaste: New plugin by Enrico Zini
- -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
+ -- Joey Hess <joeyh@debian.org> Sun, 27 Jul 2008 11:23:13 -0400
ikiwiki (2.54) unstable; urgency=low