]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into old
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:47:39 +0000 (20:47 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:47:39 +0000 (20:47 -0400)

Trivial merge