Merge branch 'lr/ap'
authorLubomir Rintel <lkundrak@v3.sk>
Fri, 31 Oct 2014 14:35:20 +0000 (15:35 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Fri, 31 Oct 2014 14:35:20 +0000 (15:35 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=738439

1  2 
clients/cli/connections.c
clients/cli/nmcli-completion
man/nmcli.1.in
src/devices/wifi/nm-device-wifi.c
src/settings/plugins/ifcfg-rh/writer.c

Simple merge
Simple merge
diff --cc man/nmcli.1.in
Simple merge
Simple merge