Merge "Support new plugin configuration schema"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 28 Jan 2016 19:34:29 +0000 (19:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 28 Jan 2016 19:34:29 +0000 (19:34 +0000)

Trivial merge