Merge "Update docs"
authorSofia Wallin <sofia.wallin@ericsson.com>
Fri, 31 Mar 2017 07:40:51 +0000 (07:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 31 Mar 2017 07:40:51 +0000 (07:40 +0000)

Trivial merge