[Merge] ~freyes/ubuntu/+source/horizon:upstream into ~ubuntu-openstack-dev/ubuntu/+source/horizon:upstream

[Corey Bryant]

The proposal to merge ~freyes/ubuntu/+source/horizon:upstream into ~ubuntu-openstack-dev/ubuntu/+source/horizon:upstream has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~freyes/ubuntu/+source/horizon/+git/horizon/+merge/416200
-- 
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/horizon:upstream.