X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a71ade73ff02e7fed9bc89d7677b29074f312628..245109fa3955240d11c568827fd8c4ee8c407e28:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index cb6ac1b92..1b485756c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
   * emailauth: Added emailauth_sender config.
   * Modified page.tmpl to to set html lang= and dir= when
     values have been specified for them, which the po plugin does.
+  * Specifically license the javascript underlay under the permissive
+    basewiki license.
 
   [ Simon McVittie ]
   * Run autopkgtest tests using autodep8 and the pkg-perl team's
@@ -19,6 +21,14 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
   * Wrap and sort control files (wrap-and-sort -abst)
   * Add enough build-dependencies to run all tests, except for
     non-git VCSs
+  * debian/copyright: update for the rename of openid-selector to
+    login-selector
+  * git: if no committer identity is known, set it to
+    "IkiWiki <ikiwiki.info>" in .git/config. This resolves commit errors
+    in versions of git that require a non-trivial committer identity.
+  * inline, trail: rename show, feedshow parameters to limit, feedlimit
+    (with backwards compatibility)
+  * pagestats: add "show" option to show meta fields. Thanks, Louis
 
  -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100