[Merge] ~jbicha/network-manager:master into ~network-manager/network-manager/+git/ubuntu-applet:master

[Aron Xu]

The proposal to merge ~jbicha/network-manager:master into ~network-manager/network-manager/+git/ubuntu-applet:master has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~jbicha/network-manager/+git/network-manager/+merge/313414
-- 
Your team Network-manager is requested to review the proposed merge of ~jbicha/network-manager:master into ~network-manager/network-manager/+git/ubuntu-applet:master.