Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 14 Sep 2011 15:09:24 +0000 (11:09 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 14 Sep 2011 15:09:24 +0000 (11:09 -0400)

Trivial merge