+ikiwiki (3.20120517) UNRELEASED; urgency=low
+
+ * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
+ other config differences by linking to the mirror's CGI. (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org> Sun, 03 Jun 2012 13:15:22 -0400
+
ikiwiki (3.20120516) unstable; urgency=high
* meta: Security fix; add missing sanitization of author and authorurl.
>>>>>> 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]]