Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 20:24:29 +0000 (16:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 20:24:29 +0000 (16:24 -0400)

Trivial merge