Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / bugs / pythonproxy-utf8_again.mdwn

diff --git a/doc/bugs/pythonproxy-utf8_again.mdwn b/doc/bugs/pythonproxy-utf8_again.mdwn
index 34bb90d68af43b924d464c9756dd2e7489a65cce..f068782b416e4abda5b4257ff59c34e497995d5f 100644 (file)
--- a/doc/bugs/pythonproxy-utf8_again.mdwn
+++ b/doc/bugs/pythonproxy-utf8_again.mdwn
@@ -63,6 +63,8 @@ patch.
 >>>> and hopefully also fixes this one. Please check that it still
 >>>> fixes your test-case too.
 >>>>
 >>>> and hopefully also fixes this one. Please check that it still
 >>>> fixes your test-case too.
 >>>>

->>>> Joey, I think this is [[users/smcv/ready for merge]] even if it
+>>>> Joey, I think this is [[ready for merge|users/smcv/ready]] even if it

 >>>> doesn't fix chrysn's bug - it does fix Python 3 support
 >>>> in general. --[[smcv]]
 >>>> doesn't fix chrysn's bug - it does fix Python 3 support
 >>>> in general. --[[smcv]]

+
+>>>>> [[merged|done]] --[[smcv]]