first cut at svn merge and conflict
[ikiwiki.git] / templates / misc.tmpl
2006-03-12  joey- use templates for signin form, error messages