Merge "Move trunk service plugin to the proper list"
authorJenkins <jenkins@review.openstack.org>
Fri, 14 Oct 2016 23:21:33 +0000 (23:21 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 14 Oct 2016 23:21:33 +0000 (23:21 +0000)

Trivial merge