Merge "Added Calipso as submodule"
authorSofia Wallin <sofia.wallin@ericsson.com>
Thu, 19 Oct 2017 14:04:58 +0000 (14:04 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 19 Oct 2017 14:04:58 +0000 (14:04 +0000)

Trivial merge