X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/285be77f17a6efb7633242a0febcadf511f61c10..84d3856512172b261b06c0220ac405d92655b713:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d2fed8767..50196b077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,20 @@
 ikiwiki (2.21) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * Old versions of git-init don't support --git-dir or GIT_DIR with
     --bare. Change ikiwiki-makerepo to use a method that should work with
     those older versions too.
   * aggregate: Don't let feeds set creation times for pages in the future.
   * Add full parser for git diff-tree output (Brian Downing)
   * aggregate: Fork a child process to handle the aggregation. This simplifies
-    the code, since that process can change internal state as needed, and 
+    the code, since that process can change internal state as needed, and
     it will automatically be cleaned up for the parent process, which proceeds
     to render the changes.
 
+  [ Josh Triplett ]
+  * Add trailing comma to commented-out umask in sample ikiwiki.setup, so
+    that uncommenting it does not break the setup file.
+
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500
 
 ikiwiki (2.20) unstable; urgency=low