diff --git a/debian/changelog b/debian/changelog
index ff2fe8220..1db98647e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
     Thanks, smcv
   * Improve templates testing.
     Thanks, smcv
+  * python proxy: Avoid utf-8 related crash.
+    Thanks, Antoine Beaupré
   * Special thanks to Simon McVittie for being the patchmeister for this
     release.
 
diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
index 746a56f6f..3d5b05618 100644
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -70,3 +70,5 @@ error: ikiwiki failed
 > > > > (I'm trying to review some of the pending patches.) --[[smcv]]
 
 >>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]