Merge branch 'master' into po

diff --cc IkiWiki.pm
Simple merge

diff --cc IkiWiki/Plugin/blogspam.pm
index d4b5b36d51e4417f497c234ced17f56482851091,cbd9859a533cf58dba27e1af20dc04368ab66e5e..58303418f7b4a137d43264879d20b209a13c4e93
--- 1/IkiWiki/Plugin/blogspam.pm
--- 2/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@@ -83,9 -83,9 +83,9 @@@ sub checkcontent (@) 
        # and "buy".
        push @options, "exclude=stopwords";
  
-       my $res = $client->send_request('testComment', {
+       my %req=(
                ip => $ENV{REMOTE_ADDR},
 -              comment => $params{content},
 +              comment => defined $params{diff} ? $params{diff} : $params{content},
                subject => defined $params{subject} ? $params{subject} : "",
                name => defined $params{author} ? $params{author} : "",
                link => exists $params{url} ? $params{url} : "",

diff --cc IkiWiki/Plugin/editpage.pm
Simple merge

diff --cc IkiWiki/Plugin/remove.pm
Simple merge