Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 28 Oct 2013 19:49:15 +0000 (15:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 28 Oct 2013 19:49:15 +0000 (15:49 -0400)

Trivial merge