]> 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>
Fri, 25 Feb 2011 18:59:13 +0000 (14:59 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 25 Feb 2011 18:59:13 +0000 (14:59 -0400)
commit02bf6a281981bf61ab0526e60c7ec931d6cd79b4
treeea4abc41962c450deca50af24cafb8a162b421fc
parentcc5f8de9e89c0028c94974a6b81f17f0628e9888
parentfbaa5bae108be3f250d5bb3ce24f05ab1ffbe74e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info