]> 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>
Tue, 28 Dec 2010 17:51:12 +0000 (13:51 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 28 Dec 2010 17:51:12 +0000 (13:51 -0400)

Trivial merge