[Merge] lp:~corey.bryant/neutron/2014.1.5 into lp:~ubuntu-server-dev/neutron/icehouse

[Chuck Short]

The proposal to merge lp:~corey.bryant/neutron/2014.1.5 into lp:~ubuntu-server-dev/neutron/icehouse has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~corey.bryant/neutron/2014.1.5/+merge/262863
-- 
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/neutron/2014.1.5 into lp:~ubuntu-server-dev/neutron/icehouse.