]> 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>
Sat, 30 Oct 2010 16:42:10 +0000 (12:42 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Oct 2010 16:42:10 +0000 (12:42 -0400)
commit0bfcc8da5d769ff4ba9425a99d2c495175ea685e
treeff4407738f495b92c4241357c60ee8ad764e7301
parentd16104f55d8b31929d0466ca9abc3ccb4af0a8e8
parentcfc1b6ac486e11cb11d6c72602bf70b0a440b747
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info