Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)
committerJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)

Trivial merge