]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 11 Nov 2013 15:51:25 +0000 (11:51 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 11 Nov 2013 15:51:25 +0000 (11:51 -0400)
commit355569327b02b7c023ced9e0bbace3174ca4c8a5
tree7a7e1de63d53c2f3d98897e2e9f9f1f61a8545ab
parent85c1479a299121781f5567940d4c983b77bab2ed
parent141f5f5e919b7017fbec8ae6b32cbbe511766d9c
Merge branch 'master' of ssh://git.ikiwiki.info