#125 added --loopdelay-ms
#125 updated the changelog
Merge pull request #163 from appneta/Enhancement_#125_delay_between_loop

#125 added loop delay
#164 kernel builds only happen on Linux
Merge pull request #165 from appneta/Bug_#164_quick_tx_breaks_os_x

#164 kernel builds only happen on Linux
#164 update changelog
Merge pull request #166 from appneta/Bug_#164_quick_tx_breaks_os_x

#164 update changelog
Merge branch 'master' into Enhancement_#157_disable_quick_tx_default

Conflicts:
	docs/CHANGELOG
Merge branch 'Enhancement_#157_disable_quick_tx_default' of github.com:appneta/tcpreplay into Enhancement_#157_disable_quick_tx_default

Conflicts:
	docs/CHANGELOG