[Merge] ~mylesjp/ubuntu/+source/python-os-vif:master into ~ubuntu-openstack-dev/ubuntu/+source/python-os-vif:master

[Nick Rosbrook]

Review: Approve


-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/python-os-vif/+git/python-os-vif/+merge/493060
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/python-os-vif:master.