[Merge] ~jbicha/network-manager:master into network-manager:master

[Matteo Croce]

Diff comments:

> diff --git a/debian/20-connectivity.conf b/debian/20-connectivity.conf
> new file mode 100644
> index 0000000..58446fb
> --- /dev/null
> +++ b/debian/20-connectivity.conf
> @@ -0,0 +1,3 @@
> +[connectivity]
> +uri=http://start.ubuntu.com/connectivity-check.html
> +response=Lorem ipsum

if this is done to detect captive portals, consider adding an ignored random argument to the URL, eg.

http://start.ubuntu.com/connectivity-check.html?id=1487844328

This will avoid proxy caching. In this example I used the Unix timestamp:

$ date +%s
1487844328



-- 
https://code.launchpad.net/~jbicha/network-manager/+git/network-manager/+merge/318031
Your team Network-manager is requested to review the proposed merge of ~jbicha/network-manager:master into network-manager:master.