From: Kyle Mestery <mestery@mestery.com>
Date: Tue, 30 Jun 2015 00:35:32 +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=7f759c077f8f860c13db92d2ea6b353ef6b70900;p=openstack-build%2Fneutron-build.git

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

Change-Id: Ib8c70c6aec4e320c84546c8ab52e29b97c62d401
---

7f759c077f8f860c13db92d2ea6b353ef6b70900