Merge "Enable BGPVPN_extension/SDNVPN_feature" into stable/brahmaputra
authorDaniel Smith <daniel.smith@ericsson.com>
Thu, 7 Apr 2016 21:18:19 +0000 (21:18 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 7 Apr 2016 21:18:19 +0000 (21:18 +0000)

Trivial merge