Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 38701b6dbeb2c18ffa4f62aa27863eed98daff85..d04e5ee25308bf6c920e4682eb69aab21ed95fc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.68) UNRELEASED; urgency=low
+ikiwiki (2.68) unstable; urgency=low

 
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
 
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.


@@ -43,7 +43,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
 
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
 

- -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 03 Nov 2008 16:31:11 -0500

 
 ikiwiki (2.67) unstable; urgency=low
 
 
 ikiwiki (2.67) unstable; urgency=low