Merge "Ignore .tox"
authorvalentin boucher <valentin.boucher@orange.com>
Mon, 22 May 2017 13:09:50 +0000 (13:09 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 22 May 2017 13:09:50 +0000 (13:09 +0000)

Trivial merge