Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index b8a6c8c88149d238e5f9f12f10c02fd5060ed6c3..b483c29cc2839d914fda82e291c5d56396c0f339 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20110322) UNRELEASED; urgency=low
+
+  * Add timezone setting in setup file. This alows time zone to be configured
+    via the web.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 Mar 2011 13:34:34 -0400
+
 ikiwiki (3.20110321) unstable; urgency=low
 
   * comment: Don't show comments of subpages on parent pages.