Merge branch 'master' into sipb

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

diff --git a/doc/bugs/pythonproxy-utf8_again.mdwn b/doc/bugs/pythonproxy-utf8_again.mdwn
index cc6d11de7a6c08eacda2625a5ef3bdbd05f740d9..f068782b416e4abda5b4257ff59c34e497995d5f 100644 (file)
--- a/doc/bugs/pythonproxy-utf8_again.mdwn
+++ b/doc/bugs/pythonproxy-utf8_again.mdwn
@@ -66,3 +66,5 @@ patch.
 >>>> 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]]
+
+>>>>> [[merged|done]] --[[smcv]]