dns: merge branch 'bg/dns-options-rh1200131'
authorBeniamino Galvani <bgalvani@redhat.com>
Wed, 13 May 2015 15:17:06 +0000 (17:17 +0200)
committerBeniamino Galvani <bgalvani@redhat.com>
Wed, 13 May 2015 15:17:06 +0000 (17:17 +0200)
https://bugzilla.redhat.com/show_bug.cgi?id=1200131


Trivial merge