]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 20:37:58 +0000 (16:37 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 20:37:58 +0000 (16:37 -0400)
commit00629adcea2fcbfc2e9a5e9bd0def6731ab6ef1c
tree5c2da116805e2573bc7ba0c05e34e938d71ecc1b
parent6d95bd7e026c95a259c63bf3da84f1b5d64fba7d
parent7a4c15aebb51230b3d3b0bd3704e75ae46e7f2e4
Merge branch 'master' of ssh://git.ikiwiki.info