Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 23:09:41 +0000 (19:09 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 23:09:41 +0000 (19:09 -0400)
commitfd2ddd9e87f758e5d2987708321ec0c6c0dd6898
tree62d5647981e508c132ca54c62fec1fe26dd5feb4
parent1c2f59239ff0a6657843c92a39249171dd8d3576
parente8ff29fa330aef5e8d30eeef44218b87c4a9d97e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info