libnm: merge branch 'th/file_search_in_path_bgo740783'
authorThomas Haller <thaller@redhat.com>
Fri, 5 Dec 2014 10:09:16 +0000 (11:09 +0100)
committerThomas Haller <thaller@redhat.com>
Fri, 5 Dec 2014 10:09:21 +0000 (11:09 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=740783


Trivial merge