Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 18:01:12 +0000 (14:01 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 18:01:12 +0000 (14:01 -0400)
commitdd349d69ea2361360b4534d9c77806345ff490ad
tree5858da519b35151b5b04bc005550608d5b0bcb2c
parente79e3143509d3f4c0273e8eed5956d264cbc56e2
parent0f67e7d96953535e98d9ec26c30a25b8aaad782c
Merge branch 'master' of file:///srv/git/ikiwiki.info

Conflicts:

doc/todo/page_edit_disable.mdwn
doc/todo/page_edit_disable.mdwn