]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 31 Oct 2010 02:03:35 +0000 (22:03 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 31 Oct 2010 02:03:35 +0000 (22:03 -0400)
commitd346b9ad1e1bca8588c5388330080dc05cfa3ef3
tree87794d56146aade6294bae7bc4aa3cbc744ef2cf
parent49865d551294f2fbf24458aa7fa4f8ddc441ce1f
parent85d262e4cab2bfa55194b445d7fd251fa5818bc6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info