From: Josh Triplett <josh@freedesktop.org>
Date: Sun, 27 Jan 2008 00:42:40 +0000 (-0800)
Subject: debian/changelog entry for commit 37b4fadcee4e500a1ac68ce9fcd8d6d942628cf6
X-Git-Tag: 2.30~115
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/295619dfa0db9531c769c86c64094b7156436033

debian/changelog entry for commit 37b4fadcee4e500a1ac68ce9fcd8d6d942628cf6

Add missing debian/changelog entry for previous commit
37b4fadcee4e500a1ac68ce9fcd8d6d942628cf6, "Add trailing comma to
commented-out umask in sample ikiwiki.setup".
---

diff --git a/debian/changelog b/debian/changelog
index d2fed8767..f001d0a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 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.
@@ -10,6 +11,10 @@ ikiwiki (2.21) UNRELEASED; urgency=low
     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