Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:05:36 +0000 (14:05 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:05:36 +0000 (14:05 -0400)

Trivial merge