Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:14:50 +0000 (00:14 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:14:50 +0000 (00:14 -0400)

Trivial merge