Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Oct 2013 17:26:42 +0000 (13:26 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Oct 2013 17:26:42 +0000 (13:26 -0400)

Trivial merge