]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 14 Jul 2010 18:28:00 +0000 (14:28 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 14 Jul 2010 18:28:00 +0000 (14:28 -0400)
commit2a5199f0110b5b6fd8b45828036061995c032336
treea6846bb9db4cc1d9802acfbb04b0aee02de594ad
parent2d24281a3abcff8f122a5899c7dee4db29acb00a
parenteda2357c3e1990df049264735e8751af8962ded5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info