]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 25 Mar 2010 18:30:58 +0000 (14:30 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 25 Mar 2010 18:30:58 +0000 (14:30 -0400)
commitb19fb349f57e7dd9914aae728c5243dc6640026f
tree5b669504e64c35d5195dce6d7f9b65458b97f509
parentbaa07e0b526fd23630f6cedcdc04960c99703722
parent46f8f72793e23b56d3deb1ed0ed6b1a0fbd56ad6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info