Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 14 Jan 2014 18:52:50 +0000 (14:52 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 14 Jan 2014 18:52:50 +0000 (14:52 -0400)

Trivial merge