From: Dan Radez <dradez@redhat.com>
Date: Fri, 4 Sep 2015 18:38:56 +0000 (-0400)
Subject: Merge branch 'master' into merge-master-arno
X-Git-Tag: arno.2015.2.0~52^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=commitdiff_plain;h=8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9

Merge branch 'master' into merge-master-arno

Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
---

8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9