]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 14 Nov 2013 00:55:42 +0000 (20:55 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 14 Nov 2013 00:55:42 +0000 (20:55 -0400)
commit5ec2d2d40d803ac0288acdcdd5125de6f4c2b769
tree8ae47ce2b1c6f68aab795e0e49bc5bf26250a24d
parent1a8b4211c2337f3e03400908b0d77aba03c2f33f
parent62483fe5cac6b420d8855b33a06c5dac1f4b2dd9
Merge branch 'master' of ssh://git.ikiwiki.info