Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 3 Apr 2008 06:36:16 +0000 (02:36 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 3 Apr 2008 06:36:16 +0000 (02:36 -0400)
commita4dc0f997c2d64c21e08d06382b9f3c3987a681f
treea58bebc7bd346dd23ee2b150bdee56829121259a
parentde8c34df59891dd06bb79777536bc9a92f919b0a
parent93d833da83eb9393b18c53e3e848619eb635af9e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info