libnm: merge NMRemoteSettings into NMClient (bgo #738103)
authorDan Winship <danw@gnome.org>
Fri, 10 Oct 2014 17:09:43 +0000 (13:09 -0400)
committerDan Winship <danw@gnome.org>
Fri, 10 Oct 2014 17:09:43 +0000 (13:09 -0400)

Trivial merge