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

Trivial merge