]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'intrigeri/master' into slop
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:06:48 +0000 (20:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:06:48 +0000 (20:06 -0400)
commit8f783821c34922281c858a2715663ee0b7ca006b
tree9cf8713723a61a83f81929657379d0a134682e79
parent7399b073a794fa941a88d75a89753f72998d1913
parent6836070c171d7a9b37c884320caefe312420d3f7
Merge commit 'intrigeri/master' into slop