Merge "Fixes sdnvpn (again)" into stable/colorado
authorTim Rozet <trozet@redhat.com>
Fri, 7 Oct 2016 14:05:55 +0000 (14:05 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 7 Oct 2016 14:05:55 +0000 (14:05 +0000)

Trivial merge