Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 6 Oct 2013 17:38:57 +0000 (13:38 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 6 Oct 2013 17:38:57 +0000 (13:38 -0400)

Trivial merge