Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 18:53:41 +0000 (14:53 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 18:53:41 +0000 (14:53 -0400)
commit99fce0af0d4e99bc81ef7847bfbe77662763e805
tree66509f6d3e5075cc075e7fb06f3bc6146219eca2
parent5d9ed614db889116421be0f24edc14b198c1e18d
parent5e52e05fd20d9185a740e45f34eec68d7678d383
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info