Merge branch 'master' into po

diff --combined doc/todo/need_global_renamepage_hook.mdwn
index a6080ddc14bb50c2f72236c7aa1a13bbce7dc93a,b065c82f3fdc9cf2c93f9b143373e3f23129c9a6..874460b292dff86ef6eaa6ab25f5656326bdba84
--- 1/doc/todo/need_global_renamepage_hook.mdwn
--- 2/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]]