]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)

Trivial merge