Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Dec 2013 17:47:44 +0000 (13:47 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Dec 2013 17:47:44 +0000 (13:47 -0400)

Trivial merge