]> 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, 11 May 2011 18:52:20 +0000 (14:52 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 11 May 2011 18:52:20 +0000 (14:52 -0400)
commit0c71184c42622b79b88ab64919e16c642ccc4f34
treeab2b387e1745310859c605e07366513a1047f74a
parent0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39
parent5f812ff1ba13c07a37a82c22e84f5e8c5b6a6143
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info