X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/080a4cb57947a7991ea5781342af5756ed7213ae..45c31be7dbf81517e854304237bb95d53657b27d:/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..5701d8e2b 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?
@@ -94,3 +99,5 @@ and decided this time it was really needed to implement this feature.
 >>>>>> this should not block the merge of the branch I have been
 >>>>>> proposing. Support for the usecase you are suggesting can
 >>>>>> always be added later if needed. --[[intrigeri]]
+
+>>>>>>> Well, that came out nice and clean. [[done]] --[[Joey]]