]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 4 Apr 2012 16:59:20 +0000 (12:59 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 4 Apr 2012 16:59:20 +0000 (12:59 -0400)
commit46d93629b0b8cff181c665f0932221a6c57956cc
treec80f454f1efaae90e40a64ad8047f079223909be
parent93bda514baad6b5e9dce5b6cce62155ac4ba7d68
parent9635833eef03b75ff741e75c1cf0c5ccec9bcac6
Merge branch 'master' of ssh://git.ikiwiki.info