Merge remote branch 'origin/master' into rm-userset
authorDan Williams <dcbw@redhat.com>
Tue, 25 Jan 2011 21:41:03 +0000 (15:41 -0600)
committerDan Williams <dcbw@redhat.com>
Tue, 25 Jan 2011 21:41:03 +0000 (15:41 -0600)
commitb7259fd2a8b87342f53d66d979c1dbfb531743eb
tree010760223e36f1e1d179a2bde0a95e62b026b123
parent3ebecd2a295b40081321d1b3f26fb1204fe5d4c4
parentbc6fc7b910435aae00ef54db972a3e8359700d09
Merge remote branch 'origin/master' into rm-userset
13 files changed:
cli/src/connections.c
docs/libnm-glib/Makefile.am
po/bg.po
src/nm-activation-request.c
src/nm-active-connection.c
src/nm-active-connection.h
src/nm-device-ethernet.c
src/nm-device-wifi.c
src/nm-device.c
src/vpn-manager/nm-vpn-connection-base.c
src/vpn-manager/nm-vpn-connection.c
src/vpn-manager/nm-vpn-connection.h
system-settings/plugins/ifcfg-rh/reader.c