Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 26 Aug 2008 00:51:45 +0000 (20:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 26 Aug 2008 00:51:45 +0000 (20:51 -0400)
commitb2d7bbb92278180afa4624837b69e1de8af12f6e
tree887880d323d5819eb1c1b3be7cc9749476255e74
parentd06096ad0d15dc7fb5e3187209a2908b3613b30b
parentb8c82018769d55f9e00fc66495a2d3cdec98616e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:

doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn