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

[Jeremy Bicha]

Jeremy Bicha has proposed merging ~jbicha/network-manager:upstream into ~network-manager/network-manager/+git/ubuntu-applet:upstream.

Requested reviews:
  Network-manager (network-manager)

For more details, see:
https://code.launchpad.net/~jbicha/network-manager/+git/network-manager/+merge/312981
-- 
The attached diff has been truncated due to its size.
Your team Network-manager is requested to review the proposed merge of ~jbicha/network-manager:upstream into ~network-manager/network-manager/+git/ubuntu-applet:upstream.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20161211/569c34cb/attachment-0001.diff>