Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 10 Apr 2008 21:12:55 +0000 (17:12 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 10 Apr 2008 21:12:55 +0000 (17:12 -0400)
commitd5c964508f159c7209b98771bed1ec8df4c952a0
treeb3dce530777e688ff1813016755d650d30c38662
parentab0e0e807a323bdda5789a8222b2e7ea4d57be2c
parent555f1d051240d6763ec1dba35de2d9eb6c6f8394
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info