Merge remote branch 'smcv/ready/transient-aggregate'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index dc5ca59180814d28a67ee8c6618cdf42c7279b69..87a280ed038aed378b490624f96011703d0ad8ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20110125) UNRELEASED; urgency=low
+
+  * editpage: Avoid inheriting internal page types.
+  * htmltidy: Avoid breaking the sidebar when websetup is running.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400
+
 ikiwiki (3.20110124) unstable; urgency=low
 
   * comments: Fix commenting, broken by security fix.