Merge branch 'manpage' of https://github.com/sitsofe/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 4 Oct 2013 15:48:15 +0000 (09:48 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 4 Oct 2013 15:48:15 +0000 (09:48 -0600)

Trivial merge