Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 16 Oct 2008 16:53:33 +0000 (12:53 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 16 Oct 2008 16:53:33 +0000 (12:53 -0400)
commitee41aedb100415e6d5f99de5b0dedd686481e73c
tree7ff8d613e7af9609ae8086b7f0dc89f46597e475
parent0517f9126cff724e62d92e4f637a1eca20f31ed7
parentfe4d7a6d3ad4915eb41cf0212821c1207457939c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info