Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 15:18:13 +0000 (11:18 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 15:18:13 +0000 (11:18 -0400)

Trivial merge