Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 14 Nov 2013 00:55:42 +0000 (20:55 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 14 Nov 2013 00:55:42 +0000 (20:55 -0400)

Trivial merge