Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Dec 2009 03:19:19 +0000 (22:19 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Dec 2009 03:19:19 +0000 (22:19 -0500)
commita21aa6b9c562cdf451977b80cbf5b31cb4d28bac
tree24b3fc413c03a66c77aa2996c494b87b7caaab58
parent18cc0aa1c2d918f16f425e4a0e18b7d16919dbf6
parenta132ca7c62df5ceb6c3be425613cd36c1938e335
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info