done

diff --git a/debian/changelog b/debian/changelog
index 5377459a2c165e2d05a3d080a4c83abe81eab447..f604adb75b48daaf53d4ba925127ec4de944d8a9 100644 (file)
--- 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.
 
   * 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
 
 
  -- 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 b7af9f9193d21316dbca3a7a31e01e85f027bd69..a483c331a96a745d3ce756d4c4be2eb9810573bd 100644 (file)
--- 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]]
 cherry-picked if you don't want the rest of `trail`.
 
 --[[smcv]]

+
+> [[done]] --[[Joey]]