Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 13 May 2008 16:44:06 +0000 (12:44 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 13 May 2008 16:44:06 +0000 (12:44 -0400)
commit6cc69038caa841861b4aa7166a9577e8520f65c0
tree8428f3ca238ab2b2e142787036b1648dce4c2a5b
parentfba4a198b58bdfb33590bda5eaf89bf96ed60099
parentf1b1e193da06177b1032728b4cc5da60217107bd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info