From: Kyle Mestery <mestery@mestery.com>
Date: Mon, 13 Jul 2015 13:40:44 +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=3a9975cbc30d9253b96cec9e079b411add184ec1;p=openstack-build%2Fneutron-build.git

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

Change-Id: I82695bcf1b78910dc415a92473ac7f539e85f36a
---

3a9975cbc30d9253b96cec9e079b411add184ec1