Merge commit 'origin/master' into po

diff --combined doc/todo/need_global_renamepage_hook.mdwn
index 874460b292dff86ef6eaa6ab25f5656326bdba84,b123340afc513340df09f1b1f7642ac2b8404dd4..e3cec4a9b1597f3de58347418ae092cacf8ffa1d
--- 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.
@@@ -111,3 -111,5 +111,5 @@@ hashes is desired, it could return the 
  >>>> 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]] 
+ 
+ >>>> Thanks, this is great :) --[[intrigeri]]