Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 12 Feb 2009 17:27:33 +0000 (12:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 12 Feb 2009 17:27:33 +0000 (12:27 -0500)
commitb2e634bfec8b68691f1479e094e68e3163c8268f
tree3311c0f4ef5e0b8e0797733c8d599701f53821da
parent1384235127c9597563ccd75593a57dda11027a91
parentaa88d6beeff168b2bd56f90646dede7c89acc4ea
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info