Merge branch 'libnm-nmobj' (bgo #734228)
authorDan Winship <danw@gnome.org>
Thu, 7 Aug 2014 19:54:42 +0000 (15:54 -0400)
committerDan Winship <danw@gnome.org>
Thu, 7 Aug 2014 19:54:42 +0000 (15:54 -0400)

Trivial merge