Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 16:44:47 +0000 (12:44 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 16:44:47 +0000 (12:44 -0400)
commit406a30ad0dd776e108c4088431a5cf8ae597c422
tree2d066db71a49727c806552b0cee51017d0b4f8f7
parentbcf3f9091a945467a7a68b5b828915e65f0ea139
parentd2071292f0f56954f01f52c0c8fd02922e9d5c21
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info