Dan Williams 6d344a43e9 Merge remote-tracking branch 'origin/rm-userset' ... There; it's merged. Yay!		2011-02-12 22:51:12 -06:00
..
plugins	Merge remote-tracking branch 'origin/rm-userset'	2011-02-12 22:51:12 -06:00
Makefile.am	everything: use libgudev instead of HAL; merge NM and nm-system-settings	2009-06-11 00:39:12 -04:00