Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Apr 2008 21:16:59 +0000 (17:16 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Apr 2008 21:16:59 +0000 (17:16 -0400)
commit9acb8151ccb8fa1ef7a769a2bb941066053cc736
treefd9ec6dd9bc6d7c99243d5c35ff09f4dda16a62f
parent788f83c97da3ae748e28574954a5c809da8910c5
parent516908cc8e90743fc8616ed8421170b3da46ffd4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info