Merge "gitignore: ignore .tox/"
authorRoss Brattain <ross.b.brattain@intel.com>
Tue, 15 Aug 2017 13:41:58 +0000 (13:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 15 Aug 2017 13:41:58 +0000 (13:41 +0000)

Trivial merge