Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:15:22 +0000 (00:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:15:22 +0000 (00:15 -0400)
commitab89494797ef6e0045428d63251287bbc05fa63b
treedad015bb942913faca452f7acb98cce57adaacd5
parent6693b3eafed5edb061ac31e046a441189660cd77
parent62306d85f998b5bbd64d213e8c591809dbc07cb8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info