Merge branch 'fio_pr_alternate_epoch' of https://github.com/PCPartPicker/fio

* 'fio_pr_alternate_epoch' of https://github.com/PCPartPicker/fio:
  Support for alternate epochs in fio log files

diff --cc HOWTO
Simple merge

diff --cc backend.c
Simple merge

diff --cc fio.1
Simple merge

diff --cc fio.h
Simple merge

diff --cc options.c
Simple merge

diff --cc os/windows/posix.c
Simple merge

diff --cc rate-submit.c
Simple merge

diff --cc stat.c
Simple merge

diff --cc thread_options.h
Simple merge