Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / outbound_proxy.mdwn

diff --git a/doc/todo/outbound_proxy.mdwn b/doc/todo/outbound_proxy.mdwn
index 856a92a12bd5bd64beee59834ccea99f7a83f608..2af0ae5ca6c51eda366a0357919ccf0df5e2f347 100644 (file)
--- a/doc/todo/outbound_proxy.mdwn
+++ b/doc/todo/outbound_proxy.mdwn
@@ -53,3 +53,5 @@ know whether its paranoia measures up or whether it supports proxies.
 > from aggregate to the config setting list in IkiWiki.pm --[[Joey]] 
 
 >> Indeed, fixed. --[[schmonz]]
+
+>>> [[merged|done]] --[[Joey]]