X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3e5197c9671e01c73bdd0c281f56a61b67995c22..8eb8755aebbe12825de076b6eac9639805d79354:/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index baad063ef..ca9cb532c 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -80,6 +80,11 @@ and decided this time it was really needed to implement this feature.
 >>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and
 >>>>>> checked it still works properly. --[[intrigeri]]
 
+>>>>>>> Joey: ping? I've rebased my `mirrorlist` branch on top of
+>>>>>>> 3.20120419, and checked it still works properly. I really
+>>>>>>> would like to see this functionality merged in time
+>>>>>>> for Wheezy. --[[intrigeri]]
+
 >>>>> concerning goto/cgiurl, what about having that as the default in
 >>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and
 >>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases?