]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
commitcfd750aad091e4f82593f63164f9de3bb711479f
tree8cc44a3a0e4b878ff918af4a133f012d97a5d352
parent6ff7d4bba6e78399cacb0d19c7e66a90ed208fbe
parent9485bd1e5d76432139e4ef691e8d61cdfe41d03b
Merge branch 'master' of ssh://git.ikiwiki.info