]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jul 2008 22:22:19 +0000 (18:22 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jul 2008 22:22:19 +0000 (18:22 -0400)

Trivial merge