summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-11-04 23:39:15 +0100
committerintrigeri <intrigeri@boum.org>2008-11-04 23:39:15 +0100
commit4c6c00ccdff71fbb8973de7d256fc987d7a2a7e0 (patch)
treec27774e2cfadf0fa3976f710941f59fd66ecaae7 /debian/changelog
parent225e21f6c5da40f3beea27e084515daf83471d95 (diff)
parent4dc4c9586dbae352c27cd316374fbf0e1db1d082 (diff)
Merge commit 'upstream/master' into prv/po
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 38701b6db..d04e5ee25 100644
--- 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.
@@ -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.
- -- 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