This reverts commit 84c4ca3343663425d9a3105dfb82637b79ec1c04
[ikiwiki] / templates / editconflict.tmpl
2008-07-23  Joey HessMerge branch 'master' into tova
2008-07-23  Joey HessMerge branch 'master' into tova
2008-07-22  Joey HessSplit out error messages from editpage.tmpl into severa...