aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-11 16:54:23 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-11 16:54:23 -0400
commita7cb3090902e23e2b0f2371539ade7ec5a4ba01b (patch)
tree1f97182b72da88c2f3d49980101242b8b5d073a2 /debian/changelog
parent5dba91cdc88c01ac1d314f24b12eb2cda651e206 (diff)
parent665da89c270f98e93b1eaa89e729f3975973ab8f (diff)
downloadikiwiki-a7cb3090902e23e2b0f2371539ade7ec5a4ba01b.tar
ikiwiki-a7cb3090902e23e2b0f2371539ade7ec5a4ba01b.tar.gz
Merge branch 'master' into dependency-types
Conflicts: debian/changelog doc/plugins/calendar.mdwn
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 442619b3b..0e288dd08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
The old interface will be removed soon, and a warning will be printed
if any plugins try to use it.
* Transitive dependencies are now correctly supported.
+ * ikiwiki-calendar: New command automates creation of archive pages
+ using the calendar plugin.
- -- Joey Hess <joeyh@debian.org> Fri, 09 Oct 2009 20:13:27 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 09 Oct 2009 19:53:50 -0400
ikiwiki (3.20091009) unstable; urgency=low