From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 26 Nov 2013 09:37:33 +0000 (+0800)
Subject: Merge branch 'debian/havana' of ssh://git.gplhost.com/var/cache/git/openstack/neutron... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2df5592ffa67a1787dd7e91e27096eb122c8041a;p=openstack-build%2Fneutron-build.git

Merge branch 'debian/havana' of ssh://git.gplhost.com/var/cache/git/openstack/neutron into debian/havana

Conflicts:
	debian/changelog

Change-Id: I34008fbaa4cc78feede1dbf05ad76c9dc185cfb1

Rewritten-From: 0ecef04a6bc481d33b02e3b841a232024d4d9eea
---

2df5592ffa67a1787dd7e91e27096eb122c8041a