dns: merge branch 'bg/resolv-conf-bgo747821'
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 4 May 2015 07:47:15 +0000 (09:47 +0200)
committerBeniamino Galvani <bgalvani@redhat.com>
Mon, 4 May 2015 07:47:15 +0000 (09:47 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=747821


Trivial merge