]> 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, 9 Feb 2011 18:47:42 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:47:42 +0000 (14:47 -0400)
commitaf3e7a30ce3308ff11bc63f8c92ec79f9ebe3021
tree9bf2303c23d5b091887038bf210ca7343d0e3a19
parent44695122bf5be19dbd7edb85a617fd0e4e4f3ae6
parent60ed6c9d16c4dad3cd54dff539edc43efa4a012f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info