From: Kyle Mestery <mestery@mestery.com>
Date: Thu, 9 Jul 2015 15:54:04 +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=ec799c458976d5bdc03f36fa4bf56c8ca0160614;p=openstack-build%2Fneutron-build.git

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

Change-Id: I9c3cb40fd12c3e404aa1e585f76970e2ee49f4d8
---

ec799c458976d5bdc03f36fa4bf56c8ca0160614