Merge "Updated list of upstream contributions in Blazar"
authorGerald Kunzmann <kunzmann@docomolab-euro.com>
Mon, 27 Nov 2017 21:44:08 +0000 (21:44 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 27 Nov 2017 21:44:08 +0000 (21:44 +0000)

Trivial merge