Merge "Enhance karaf-parent with karaf.localFeature"
authorMoiz Raja <moraja@cisco.com>
Mon, 5 Jan 2015 23:08:13 +0000 (23:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 5 Jan 2015 23:08:14 +0000 (23:08 +0000)

Trivial merge