From: intrigeri <intrigeri@boum.org>
Date: Thu, 26 May 2011 15:12:43 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into anonpush
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4f609f457dd99ece54c36e92acc94fa2e9db3498?hp=0cb3d3a5207abc900a93a58fdb506003303fb9e7

Merge remote branch 'upstream/master' into anonpush
---

diff --git a/doc/todo/Add_HTML_support_to_po_plugin.mdwn b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
index ec29e4f61..9c4b8c701 100644
--- a/doc/todo/Add_HTML_support_to_po_plugin.mdwn
+++ b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
@@ -5,3 +5,5 @@ the rest.
 This is implemented in my po branch, please review. --[[intrigeri]]
 
 [[!tag patch]]
+
+> This has been merged for a while => [[done]].