]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 9 Feb 2012 20:01:16 +0000 (16:01 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 9 Feb 2012 20:01:16 +0000 (16:01 -0400)
commit77f8b672382a1b3b408bd0a3bf2360214e122863
tree842e3ad2ae05a8e725a30ca2a73d45c425f9024a
parent38ff2b44c689e94cd0976620b0f5db8ba53bf225
parent4a6450ca73ed20848cc2d988f42ccbb3ec130e93
Merge branch 'master' of ssh://git.ikiwiki.info