Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:19:58 +0000 (16:19 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:19:58 +0000 (16:19 -0400)
commit34c72f21627c6fc9f7a383786b8c13b002390da0
treef95f9323c391358f3acd4959637f09eeb3739f12
parent4b2eaac156433d6e16b4b63660654bb26561b77f
parent3a188c047b4fed29865e7516f3b208901b22161d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info