]> 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>
Thu, 12 Aug 2010 20:55:08 +0000 (16:55 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 12 Aug 2010 20:55:08 +0000 (16:55 -0400)

Trivial merge