Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 8 Mar 2009 16:50:24 +0000 (12:50 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 8 Mar 2009 16:50:24 +0000 (12:50 -0400)
commit311182a699ca15c7a44bd7cbf9d2c950ea1f48f0
treea8b257fe4a4ff3c81434aecb62d1febccc9d554e
parent1dba400c2ce92af646bcf4b0ae1085857d912cc8
parent5e60e13a2070cce4f7feae59164a6cb3460d46b7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/todo/mdwn_preview.mdwn
doc/todo/mdwn_preview.mdwn