Jeremy 929c337e8b Merge branch 'unstable' ...

Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py

2015-04-29 16:29:45 -06:00

..

test_iou_manager.py

Merge branch 'unstable'

2015-04-29 16:29:45 -06:00

test_iou_vm.py

Skip IOU test on Windows

2015-04-27 15:09:42 +02:00