]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'remotes/github/pedigree' into slop
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 27 Aug 2009 23:44:17 +0000 (19:44 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 27 Aug 2009 23:44:17 +0000 (19:44 -0400)

Trivial merge