Joey Hess 041923a89e Merge branch 'master' into autoconfig ... Conflicts: IkiWiki/Plugin/git.pm debian/changelog po/ikiwiki.pot		2008-07-31 19:35:37 -04:00
..
Plugin	Merge branch 'master' into autoconfig	2008-07-31 19:35:37 -04:00
Setup	…
CGI.pm	…
Render.pm	…
Setup.pm	…
UserInfo.pm	…
Wrapper.pm	…