Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 17 Sep 2013 18:11:19 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 17 Sep 2013 18:11:19 +0000 (14:11 -0400)

Trivial merge