]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sat, 18 Apr 2015 16:35:36 +0000 (12:35 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 18 Apr 2015 16:35:36 +0000 (12:35 -0400)
commit2906a3f0f7b6e70197a46104fbad23d70c116c56
tree5b71b47293d69d2e846e81cb31d1d87f59e0952d
parent3fe1f39f88b68e6ca4301fec50c5003250e82ee6
parent0252e5703daa6b366bac2a1d2dc5983959360f52
Merge branch 'master' of ssh://git.ikiwiki.info