Merge "Upstream: Fuel@OPNFV: Fuel Master VM templates" into stable/colorado
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 12 Oct 2016 19:49:39 +0000 (19:49 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 12 Oct 2016 19:49:39 +0000 (19:49 +0000)

Trivial merge