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

Trivial merge