Merge "Added VNF_Catalogue Server"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 10 Feb 2017 13:00:13 +0000 (13:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 10 Feb 2017 13:00:13 +0000 (13:00 +0000)

Trivial merge