]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)

Trivial merge