Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 13:59:50 +0000 (09:59 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 13:59:50 +0000 (09:59 -0400)
commitb386fd2185d2444b5dea4133646ec73e9867edb3
tree38131b46baa81d424535109a7b28565fec1e6ce4
parent46617c23f41b4d530cff53399c625a324a73e1c7
parent6153fd6d88fd41ee12a850652a6903a17ae9edda
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info