]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:07:53 +0000 (17:07 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:07:53 +0000 (17:07 -0400)

Trivial merge