Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 24 Nov 2014 15:25:40 +0000 (11:25 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 Nov 2014 15:25:40 +0000 (11:25 -0400)

Trivial merge