ikiwiki/templates
Josh Triplett 122f6df325 Merge branch 'master' into prefix-directives
Conflicts:

	debian/changelog
	templates/change.tmpl
2008-02-09 23:02:52 -08:00
..
aggregatepost.tmpl
archivepage.tmpl
atomitem.tmpl
atompage.tmpl
blogpost.tmpl
change.tmpl Merge branch 'master' into prefix-directives 2008-02-09 23:02:52 -08:00
editpage.tmpl
estseek.conf
feedlink.tmpl
inlinepage.tmpl
misc.tmpl
page.tmpl
passwordmail.tmpl
recentchanges.tmpl
rssitem.tmpl
rsspage.tmpl
searchform.tmpl
titlepage.tmpl