Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 21 Oct 2008 21:57:32 +0000 (17:57 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 21 Oct 2008 21:57:32 +0000 (17:57 -0400)
commita18fea41cd562b090c77fab2d98544ba07e357a1
tree9b7eeb9d14d1818792c7dbce2c0d1d505c30f5e7
parente75818572fff5256d16221a2b065b214d8cb9f5d
parentf1f7b9a38e5d66fb8b1e03183728de5f2b1e266b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info