]> 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, 18 Jul 2010 21:39:28 +0000 (17:39 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Jul 2010 21:39:28 +0000 (17:39 -0400)
commitad8cb6d6fafa77be4e97a983d1b209f79aaf65ac
tree0f6ab8b8948bae67ef553a7aa7c9d844117040a9
parente674bb1445378ce43ae60720e42d6c418270001a
parent9ea48dd49bc37bca9c7efe9a35541360b67a51aa
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info