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

Trivial merge