Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 19 Oct 2008 23:27:15 +0000 (19:27 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 19 Oct 2008 23:27:15 +0000 (19:27 -0400)
commite4e89b8c615bf30c64e26d8b3cbaecd8814504bc
tree0eaa22292a5fa646634522a3826322e6db18d525
parent4413307afa839ac906b7b504b6b580c4c2a98310
parentd8e653e6847aa626ca18cb5444f96dbc5325aaae
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info