Merge "Plugin config + bugfix + refactoring"
authorSzilard Cserey <szilard.cserey@ericsson.com>
Wed, 28 Oct 2015 09:50:52 +0000 (09:50 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 28 Oct 2015 09:50:52 +0000 (09:50 +0000)

Trivial merge