Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	IkiWiki/Plugin/aggregate.pm

diff --cc IkiWiki/Plugin/aggregate.pm
index 1f09c988b8ab8bdf05bd6ba2cad4bf787d904a42,e9349286300cc49a1d17287c1922f143841e4994..2fcdec9e73d71ad303ff4f807d8f81a9bcc58248
--- 1/IkiWiki/Plugin/aggregate.pm
--- 2/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@@ -113,10 -114,17 +114,16 @@@ sub launchaggregation () { #{{
        return 1;
  } #}}}
  
+ #  Pages with extension _aggregated have plain html markup, pass through.
+ sub htmlize (@) { #{{{
+       my %params=@_;
+       return $params{content};
+ } #}}}
+ 
 +# Used by ikiwiki-transition aggregateinternal.
  sub migrate_to_internal { #{{{
 -
        if (! lockaggregate()) {
 -              error("an aggregation process is already running");
 -              return;
 +              error("an aggregation process is currently running");
        }
  
        IkiWiki::lockwiki();