Merge branch 'master' into templatemove
[ikiwiki] / doc / todo / edittemplate_should_look_in_templates_directory_by_default.mdwn
2010-04-22  Joey Hessadd