Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 18 Oct 2009 00:53:57 +0000 (20:53 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 18 Oct 2009 00:53:57 +0000 (20:53 -0400)
commita43194c57bdf72d3968f445f2059736956c0a2ea
tree2f683fd8b891784cd39889d0cd7dd0f5d06c1b98
parent1d094d82a3ebdc277680c88ae47bbb78dab62328
parent1859ccf8ace69c7f2db4872b269be10a66b41e4d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info