Merge branch 'master' into autoconfig

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e146bf8d4ab93efabb782abe5fda9215d8b0deb1..865544786ae7f91e44b3db8f1eac0d6392ce2b9e 100644 (file)
--- 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