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)
commita3b7bc9cc69f83781f2454270620eec6d3596112
tree8e14bc2b5c88bc5d8c1922d55a905cbf53ae0cb4
parentf628d0ad5a7b6cd2d6dd084704fac294826be784
parent58236b0ab2d2a48eb11e8267bb2fe038bb6f382c
dns: merge branch 'bg/dns-options-rh1200131'

https://bugzilla.redhat.com/show_bug.cgi?id=1200131