Merge branch 'master'

Conflicts:
	doc/ikiwiki-makerepo.mdwn

1 files changed, 6 insertions, 6 deletions

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index ed1f4ddfc..451cd6f84 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -4,13 +4,12 @@ package IkiWiki::Plugin::goodstuff;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my @bundle=qw{
 	brokenlinks
 	img
 	map
-	meta
 	more
 	orphans
 	pagecount
@@ -23,21 +22,22 @@ my @bundle=qw{
 	template
 	toc
 	toggle
+	repolist
 };
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "goodstuff", call => \&getsetup);
 	foreach my $plugin (@bundle) {
 		IkiWiki::loadplugin($plugin);
 	}
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 1