From: armando-migliaccio <armamig@gmail.com>
Date: Tue, 1 Sep 2015 06:29:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into pecan
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=22188bb0d96b05e9e2a8eb6ed73b18b6d36fc2ac;p=openstack-build%2Fneutron-build.git

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

Change-Id: I9df72f59c7e65414ddbc8431676312a0d4fd36c8
---

22188bb0d96b05e9e2a8eb6ed73b18b6d36fc2ac