diff options
| author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
| commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
| tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /Bundle/IkiWiki | |
| parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
| parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'Bundle/IkiWiki')
| -rw-r--r-- | Bundle/IkiWiki/Extras.pm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index 40b36e7c8..48bd127f1 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -34,7 +34,6 @@ Net::Amazon::S3 Text::WikiCreole Term::ReadLine::Gnu HTML::Tree -Authen::Passphrase Sort::Naturally =head1 AUTHOR |