Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 6 Jul 2008 17:58:47 +0000 (13:58 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 6 Jul 2008 17:58:47 +0000 (13:58 -0400)
commit33e9442f4ae174ddf58b61b04190a26d5ac0ccce
tree8b061ed581305c5971ec3942be48861f5254298e
parentc1687b1f1e13ce4acbe9aa8ad162918c78681a84
parentbb3036317d6e4102545506f200e594cc67d7589b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info