Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 12 Jun 2008 20:04:50 +0000 (16:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 12 Jun 2008 20:04:50 +0000 (16:04 -0400)
commit28aba38ed97fc779ce1c4139549e05b8336beaef
tree7f57fedcd77efda90bf33bd7658cfe4375dd60e7
parent79ed37ccf63a38093b352fbccc9649f5f2008d3f
parentfd62f7a55018e5dfb5b1f4ec2dca46514cb65d46
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info