Merge branch 'master' into autotag

Conflicts:
	IkiWiki/Plugin/tag.pm

diff --cc IkiWiki.pm
Simple merge

diff --cc IkiWiki/Plugin/tag.pm
index 6a6517671c3331909edb4ce60d4c920bc942e1c8,62e0cc3b82e04437b63742d61ad90b4ab0fd73ff..72ae682f3121f31df87bed58dce79341f58abd07
--- 1/IkiWiki/Plugin/tag.pm
--- 2/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@@ -169,7 -125,9 +169,9 @@@ sub pagetemplate (@) 
  package IkiWiki::PageSpec;
  
  sub match_tagged ($$;@) {
-       return match_link($_[0], IkiWiki::Plugin::tag::taglink($_[1]), linktype => 'tag');
+       my $page=shift;
+       my $glob=shift;
 -      return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag', @_);
++      return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
  }
  
  1

diff --cc IkiWiki/Render.pm
Simple merge