Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 17 Nov 2014 14:49:02 +0000 (10:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 17 Nov 2014 14:49:02 +0000 (10:49 -0400)

Trivial merge