Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 18:21:46 +0000 (14:21 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 18:21:46 +0000 (14:21 -0400)
commitefcbb32f7c54ad8ffa2e56d52e651c18bd8be55a
tree203223826704a4fa06d7c53fe0e47e81c6d4adba
parent81fd5a35a5ae28e57bb964b86939bde401771759
parenteadff687abbec442423967d5cba3bcfb606dc1a9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info