From: Kyle Mestery <mestery@mestery.com>
Date: Fri, 31 Jul 2015 13:41:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into merge-branch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9badcd249dab2d3330f0cd608496b59c9f44499a;p=openstack-build%2Fneutron-build.git

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

Change-Id: I42fb51c428c5ddf39501b9dc1792add62206f4d6
---

9badcd249dab2d3330f0cd608496b59c9f44499a