Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 05:51:49 +0000 (01:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 05:51:49 +0000 (01:51 -0400)
commit2aac9cdb30f1dd6202cca44e505a0e6481e3dd6c
tree04222f244d46a988f6d6f5e75b4b62d88f13e310
parent7ff928b7212b4c378c7e89cb71a4dd46f0cce28e
parent85c75c8f9db6bca2a536aa2569d00f7f6d3ca481
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info