Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Sep 2013 14:46:10 +0000 (10:46 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Sep 2013 14:46:10 +0000 (10:46 -0400)

Trivial merge