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

Trivial merge