Merge "Drop the neutron dnsmasq config file options"
authorJenkins <jenkins@review.openstack.org>
Wed, 13 Jul 2016 08:07:55 +0000 (08:07 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 13 Jul 2016 08:07:55 +0000 (08:07 +0000)

Trivial merge