Merge remote branch 'origin/master' into rm-userset
authorDan Williams <dcbw@redhat.com>
Mon, 27 Sep 2010 15:30:46 +0000 (10:30 -0500)
committerDan Williams <dcbw@redhat.com>
Mon, 27 Sep 2010 15:30:46 +0000 (10:30 -0500)
commit8b41f70dd54b0621bf4c096dcd9687531566b5dd
treebd766631d78f5d927afeb335436c66134159e4a3
parent6e287e41796add8acde11fbe8b4efc3282520969
parent9c0a812d52e79dc8214e91c9fa003508485ea03e
Merge remote branch 'origin/master' into rm-userset
15 files changed:
cli/src/connections.c
introspection/Makefile.am
introspection/nm-manager-client.xml
introspection/nm-manager.xml
man/nmcli.1.in
src/nm-device.c
src/nm-manager.c
src/nm-manager.h
src/nm-policy.c
src/system-settings/nm-sysconfig-settings.c
src/vpn-manager/nm-vpn-connection.c
system-settings/plugins/ifupdown/plugin.c
system-settings/plugins/keyfile/nm-keyfile-connection.c
system-settings/plugins/keyfile/plugin.c
system-settings/plugins/keyfile/writer.c