From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Dec 2011 18:34:12 +0000 (-0400)
Subject: done
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bf7ee5deaf01d90b38ff9011fe92b26f0793189;p=ikiwiki.git

done
---

diff --git a/debian/changelog b/debian/changelog
index 5377459a2..f604adb75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low
 
   * Consume all stdin when rcs_receive short-circuits,
     to avoid git SIGPIPE race.
+  * Add path and path_natural sort orders (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Dec 2011 15:14:48 -0400
 
diff --git a/doc/todo/sorting_by_path.mdwn b/doc/todo/sorting_by_path.mdwn
index b7af9f919..a483c331a 100644
--- a/doc/todo/sorting_by_path.mdwn
+++ b/doc/todo/sorting_by_path.mdwn
@@ -14,3 +14,5 @@ It's one commit (including a regression test) which can be
 cherry-picked if you don't want the rest of `trail`.
 
 --[[smcv]]
+
+> [[done]] --[[Joey]]