joey 6b6fd778c7 conflict detection, merging, etc should be done now, I think		2006-03-19 20:34:59 +00:00
..
editpage.tmpl	conflict detection, merging, etc should be done now, I think	2006-03-19 20:34:59 +00:00
misc.tmpl	…
page.tmpl	…
passwordmail.tmpl	…
recentchanges.tmpl	…