]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Apr 2014 22:50:15 +0000 (18:50 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Apr 2014 22:50:15 +0000 (18:50 -0400)

Trivial merge