cli,vpn: merge branch 'lr/nm-1-0-fixes'
authorLubomir Rintel <lkundrak@v3.sk>
Thu, 20 Nov 2014 15:12:21 +0000 (16:12 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Thu, 20 Nov 2014 15:12:21 +0000 (16:12 +0100)
Fixes for various issues identified during 1.0 testing.

https://bugzilla.gnome.org/show_bug.cgi?id=740135

1  2 
clients/cli/agent.c

Simple merge