Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 19 Oct 2008 23:55:28 +0000 (19:55 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 19 Oct 2008 23:55:28 +0000 (19:55 -0400)
commit3bdc66d30045a7259a7a71173fc6ce85b17cfaf6
treee243621b2a2678ed4350dce85d733dab9bf60c53
parentdb146d9f1e70b69b13b02b7484027b288de5decf
parent991c1b096b3f21e99352e43e6c2615df9dae1331
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info