]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
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)

Trivial merge