]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 23 Jan 2012 22:16:26 +0000 (18:16 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 23 Jan 2012 22:16:26 +0000 (18:16 -0400)
commit0376a8da8ac42a4c7da4acfd588767ff8e062364
treec23ac692e5c258ad3ae5f01768b7ce9ce3054967
parent100a68f4e2f8773a5482186f22545544b20bcfe4
parent354e4aaa04eedaa02e99aa670b807d0da41c5f47
Merge branch 'master' of ssh://git.ikiwiki.info