diff options
author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
tree | 09637db5faf2632b67b581cf04463fe4493584d4 /Bundle | |
parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'Bundle')
-rw-r--r-- | Bundle/IkiWiki.pm | 12 | ||||
-rw-r--r-- | Bundle/IkiWiki/Extras.pm | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm index 74832323a..769791d30 100644 --- a/Bundle/IkiWiki.pm +++ b/Bundle/IkiWiki.pm @@ -16,17 +16,17 @@ perl -MCPAN -e 'install Bundle::IkiWiki' =head1 CONTENTS -XML::Simple Text::Markdown -Date::Parse -HTML::Template HTML::Scrubber -CGI +HTML::Template +HTML::Parser +URI +XML::Simple +Date::Parse CGI::FormBuilder CGI::Session Mail::Sendmail -HTML::Parser -URI +CGI Data::Dumper =head1 AUTHOR diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index abf596f00..582d4a966 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -31,6 +31,10 @@ Text::Textile Text::WikiFormat XML::Feed Net::Amazon::S3 +Text::WikiCreole +Term::ReadLine::Gnu +HTML::Tree +Authen::Passphrase =head1 AUTHOR |