[Merge] lp:~phablet-team/network-manager/lp1461593-wily into lp:~network-manager/network-manager/ubuntu

[Mathieu Trudel-Lapierre]

Review: Needs Fixing

Ofono bits probably should be folded in to the main patch; anything that touches the core NM code should be split out by itself, so that we can upstream just that independently from any ofono support code.

If you want, I could possibly do the patch mangling.
-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1461593-wily/+merge/264894
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/lp1435776-wily.