Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 22 Aug 2008 02:25:53 +0000 (22:25 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 22 Aug 2008 02:25:53 +0000 (22:25 -0400)
commita98bfb05c066fcc0454b8904b881a22f879ab2b6
tree320fc74f22aa11b32e46efbeb4b6ae64ab853138
parent65c12dffecc49df2d8135a32121b9cabe8288cae
parent00327e6bcdd41877a945bf018769662119d3b324
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info