Merge more tests

author Hanoh Haim <[email protected]>

Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)

committer Hanoh Haim <[email protected]>

Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)
author Hanoh Haim <[email protected]>
Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)
committer Hanoh Haim <[email protected]>
Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)
diff --cc scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
Simple merge
diff --cc scripts/stl/imix.py
Simple merge
author	Hanoh Haim <[email protected]>
	Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)
committer	Hanoh Haim <[email protected]>
	Wed, 10 Feb 2016 08:46:04 +0000 (10:46 +0200)
		1	2
scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/stl/imix.py	patch \|	diff1 \|	diff2 \|	blob \| history