From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 18 Apr 2016 15:54:55 +0000 (+0000)
Subject: Merge "Author: Luke Hinds <lhinds@redhat.com> Date:   Mon 18 Apr 11:48:27 2016 +0100"
X-Git-Tag: 0.2~1593
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f731974343c71ef02ec5d99d3fbae9ee2adb4115;p=functest-xtesting.git

Merge "Author: Luke Hinds <lhinds@redhat.com> Date:   Mon 18 Apr 11:48:27 2016 +0100"
---

f731974343c71ef02ec5d99d3fbae9ee2adb4115