Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 30 Aug 2011 15:38:30 +0000 (11:38 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 30 Aug 2011 15:38:30 +0000 (11:38 -0400)

Trivial merge