]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 10 Feb 2013 16:42:56 +0000 (12:42 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 10 Feb 2013 16:42:56 +0000 (12:42 -0400)

Trivial merge