dns: merge branch 'th/dns-resolv-conf-file-bgo764004'
authorThomas Haller <thaller@redhat.com>
Wed, 23 Mar 2016 08:12:04 +0000 (09:12 +0100)
committerThomas Haller <thaller@redhat.com>
Wed, 23 Mar 2016 08:12:04 +0000 (09:12 +0100)
https://mail.gnome.org/archives/networkmanager-list/2016-March/msg00123.html
https://bugzilla.gnome.org/show_bug.cgi?id=764004


Trivial merge