Merge commit 'upstream/master' into prv/po

diff --cc IkiWiki/Plugin/rename.pm
index 82639a073349f8f2ef1d5943df11b653a2f88a9a,41af3ca4d61b2495dc0e69e77da6513a2de07373..f793495612c2d360dd2df480c33913f0ad801b7b
--- 1/IkiWiki/Plugin/rename.pm
--- 2/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@@ -442,11 -405,28 +428,28 @@@ sub sessioncgi ($$) 
                exit 0;
        }
  }
+                                               
+ sub linklist {
+       # generates a list of links in a form suitable for FormBuilder
+       my $dest=shift;
+       my $list=shift;
+       # converts a list of pages into a list of links
+       # in a form suitable for FormBuilder.
+ 
+       [map {
+               {
+                       page => htmllink($dest, $dest, $_,
+                                       noimageinline => 1,
+                                       linktext => pagetitle($_),
+                               )
+               }
+       } @{$list}]
+ }
  
 -sub renamepage_hook ($$$$) {
 +sub renamelink_hook ($$$$) {
        my ($page, $src, $dest, $content)=@_;
  
 -      IkiWiki::run_hooks(renamepage => sub {
 +      IkiWiki::run_hooks(renamelink => sub {
                $content=shift->(
                        page => $page,
                        oldpage => $src,

diff --cc IkiWiki/Plugin/skeleton.pm.example
Simple merge