Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)

Trivial merge