merge fix for selflink po problem

diff --git a/debian/changelog b/debian/changelog
index b7387a05031fe8833bb0a10b7235b0da2b10b61a..db828f5806a0436beb164e9a19ed8ecf90090fee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
   * Updated French program translation from Philippe Batailler. Closes: #589423
+  * po: Fix selflink display on tranlsated pages. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index c4f6662ce5b66da2fb0d2a9b1bc218dc34475bd9..b276c075d486b5261154cd728e799c74b1493a3f 100644 (file)
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -5,7 +5,7 @@ isn't. --[[intrigeri]]
 
 Fixed in my po branch. --[[intrigeri]]
 
-[[!tag patch]]
+[[!tag patch done]]
 
 > bump?