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)
commitad6dbc504badb0c91c5f8da7b043ae892fb19fe8
treedc655f86b64f5e6ce06780a1354302c3e40e0f3a
parentf529fedd178515bf3529ba1e758fc3f6e217b708
parentb1a81e5165e21eec82a68a3aece24027d58f5330
dns: merge branch 'bg/resolv-conf-bgo747821'

https://bugzilla.gnome.org/show_bug.cgi?id=747821