From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Jan 2013 19:30:25 +0000 (-0400)
Subject: changelog
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=812a5a136d522107053a15fdb3e518054c44a0e1;p=ikiwiki.git

changelog
---

diff --git a/debian/changelog b/debian/changelog
index 948fdcc84..edd0f2cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low
   * aggregate: When run with --aggregate, if an aggregation is already
     running, don't go on and --refresh.
   * trail: Converted all dependencies to presence dependencies.
+  * opendiscussion: Don't allow editing discussion pages if discussion pages
+    are disabled. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400