Merge branch 'unstable'

Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
This commit is contained in:
Jeremy committed 2015-04-29 16:29:45 -06:00
commit 929c337e8b
24 files changed
+677 -216

No files matched your search

@@ -161,6 +161,7 @@ class VirtualBox(BaseManager):
@asyncio.coroutine
def get_list(self):
def list_images(self):
"""
Gets VirtualBox VM list.
"""