]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:30:29 +0000 (13:30 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:30:29 +0000 (13:30 -0400)
commitdfef51e10ed46419ce361411a0fd27966d84e21e
treece925c4ffad3e49b7423fc992da1282cbda5ee0a
parent0196e1f9fcfebbf904e59c029e494cb2186793e6
parent7a89dbb8225b00ec7f1ee559f2b8daad8e0ae404
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info