Merge "BUG-628 Allow configuration to override module based capabilities from remote...
authorTony Tkacik <ttkacik@cisco.com>
Fri, 1 Aug 2014 08:27:50 +0000 (08:27 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 1 Aug 2014 08:27:50 +0000 (08:27 +0000)

Trivial merge