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
..
2015-04-27 23:12:13 +02:00
2015-04-29 16:29:45 -06:00
2015-04-27 23:12:13 +02:00
2015-04-27 23:28:12 +02:00
2015-03-17 16:31:45 +01:00
2015-04-28 15:31:00 +02:00
2015-03-14 13:16:27 -06:00