]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)
commit04f17b382f644c35d93928f48f6b79564fa1344c
tree97905e97acacca037ad444bf1b2a746a2f18f88f
parentd9d61a5360e256e8837e1da2baba1cb5fef19763
parent43785417d06e098ebc4f48acc458ad151563e937
Merge branch 'master' of ssh://git.ikiwiki.info