]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 14 Sep 2011 15:09:24 +0000 (11:09 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 14 Sep 2011 15:09:24 +0000 (11:09 -0400)
commit225a557b10de7ddf0ad1706326db7dfc2ed703e3
tree1eea34a0bd3be4df338b7f8778d3c1fdabe6d85c
parent5064e4ec5e2025ef3fd688d8818dd97a42c70bba
parent5add7f4451b4db7291e2e40aa28ce7d537059a58
Merge branch 'master' of ssh://git.ikiwiki.info