Merge remote-tracking branch 'origin/gns-80-cloud-image' into dev

Conflicts:
	cloud-image/create_image.py
This commit is contained in:
Jerry Seutter 2014-06-27 14:19:17 +00:00
commit ab42b41d39

Diff Content Not Available