Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 13 Sep 2008 01:19:35 +0000 (21:19 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 13 Sep 2008 01:19:35 +0000 (21:19 -0400)
commitf1e29d04a603351bd92780d1349d848b0eceba05
tree3ab36f0dba9a4e5ba573599cabfc8c2791a1f113
parente1bca54a59c81494b2ee3b9f97da432a6a38d06a
parentec6cd6fff8682b8b35007eabc3d587535bdb91e3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info