From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Mar 2009 19:51:35 +0000 (-0400)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~197
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591?hp=-c

Merge branch 'master' into po
---

a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591
diff --combined doc/todo/need_global_renamepage_hook.mdwn
index a6080ddc1,b065c82f3..874460b29
--- a/doc/todo/need_global_renamepage_hook.mdwn
+++ b/doc/todo/need_global_renamepage_hook.mdwn
@@@ -61,7 -61,7 +61,7 @@@ would solve my problem. Hmmm? --[[intri
  >>> not be broken. I will thus keep the existing `renamepage` as it
  >>> is, and call `rename` the global hook I need. --[[intrigeri]]
  
 ->>>> Done in my `po` branch. --[[intrigeri]]
 +>>>> [[Done]] in my `po` branch. --[[intrigeri]]
  
  I think I see a problem in the rename hook. The hook is called
  before the plugin adds any subpages to the set of pages to rename.
@@@ -107,3 -107,7 +107,7 @@@ hashes is desired, it could return the 
  >>> I've implemented this nice solution in my po branch, please review.
  >>> I'm slowly coming back to do the last bits needed to get my po and
  >>> meta branch merged.  --[[intrigeri]]
+ 
+ >>>> It looks good. I made some small changes to it in my own po branch.
+ >>>> Nothing significant really. If this were not tied up in the po branch,
+ >>>> I've have merged it to master already. --[[Joey]]