Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:

	doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn

diff --cc doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
index 162bcf9abc0067e150b0af0489e85815eedf29c8,d0bbbe969c81eaf0e77ed468495161ffa2e2b34f..4405a7ab8b5b5de35df0bbb8fc1a48a00760a70c
--- 1/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
--- 2/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
+++ b/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
@@@ -1,3 -1,3 +1,5 @@@
- It appears that the 'editcontent' textarea that should be saved across previews is being overridden whenever an edittemplate is in use, 'losing' edits on preview unless the browser maintains them in history.
+ The 'editcontent' textarea that should be saved across previews is being overridden whenever an edittemplate is in use, 'losing' edits on preview unless the browser maintains them in history.
+ 
+   --[[JoeRayhawk]]
 +
 +> ugly one... [[done]] --[[Joey]]