From: armando-migliaccio <armamig@gmail.com>
Date: Thu, 17 Sep 2015 00:07:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into walnut
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fdc3431ccd219accf6a795079d9b67b8656eed8e;p=openstack-build%2Fneutron-build.git

Merge remote-tracking branch 'origin/master' into walnut

Change-Id: Ic6314ef9c1db6524fbb0ed8b1bacdc2b081c4775
---

fdc3431ccd219accf6a795079d9b67b8656eed8e