]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 2 Oct 2015 15:50:44 +0000 (11:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 2 Oct 2015 15:50:44 +0000 (11:50 -0400)
commit849b5446fa7279c99242c5cfe457deee0b9165c6
tree0bfea2e4268ca59b495eeb324d99a539dd208cb3
parent32923e732b846af791b58e7b2daed8585d1819f6
parent88bb9658ecff9092b7098d9b2fcbe770d81829a4
Merge branch 'master' of ssh://git.ikiwiki.info