Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 00:28:24 +0000 (20:28 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 00:28:24 +0000 (20:28 -0400)
commit9a62836d288fbced42b04a172baf52063ef71c61
tree10e335d17fa83256cfa0a19f927b36076c30c5ef
parent79b376f9912891a8748fcbb4580969e4dbf7fc75
parent3690864e2ba9028f6440df6a12610a2499dea9c5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info