debian/copyright: consolidate permissive licenses

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

diff --git a/debian/changelog b/debian/changelog
index 11a761170b113947079a2c4167173d1c300f7507..006cd01a32bbf52c37a3115eec0679df7e08a898 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
   * Populate pagectime from either mtime or inode change time,
     whichever is older, again for more reproducible builds
   * debian: build the docwiki with LC_ALL=C.UTF-8 and TZ=UTC
+  * debian/copyright: consolidate permissive licenses
 
  -- Joey Hess <id@joeyh.name>  Tue, 28 Apr 2015 12:24:08 -0400