summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-10 13:44:27 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-10 13:44:27 -0400
commit81a9b5feffa241cea901c3633323bb446d61edf3 (patch)
tree27305271777ee0068075b06046c015bfbd17054f /debian/changelog
parent8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593 (diff)
parent98ed7cb1d7f99790821b99b3779d6685114fa662 (diff)
Merge branch 'master' into cvs
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6109a7012..2e1781713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
* Add French basewiki translation from the Debian French l10n team,
including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+ * Expand banned_users; it can now include PageSpecs, which
+ allows banning by IP address.
+ * underlay: Also allow configuring additional directories to search
+ for template files in.
+ * Fix parsing web commits from ipv6 addresses.
-- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400