Merge branch 'master' into capture

author imarom <[email protected]>

Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)

committer imarom <[email protected]>

Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)
author imarom <[email protected]>
Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)
committer imarom <[email protected]>
Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)
diff --cc src/main_dpdk.cpp
Simple merge
diff --cc src/stateless/cp/trex_stateless_port.cpp
Simple merge
author	imarom <[email protected]>
	Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)
committer	imarom <[email protected]>
	Sun, 29 Jan 2017 16:07:33 +0000 (18:07 +0200)
		1	2
src/main_dpdk.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/stateless/cp/trex_stateless_port.cpp	patch \|	diff1 \|	diff2 \|	blob \| history