]> 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>
Sun, 15 Aug 2010 15:54:16 +0000 (11:54 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 15:54:16 +0000 (11:54 -0400)
commit522c88c2771177ca0074397f8d675bcecaa4f9de
treee2cf9a50539eaa9e3d928a6bf03231a9ba8a91f5
parent67d0645e07b8bba3977a9a4edefacc54c652ca67
parente0f1d657983d5bf612cf70f231bf166c0b6d67d5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info