From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 25 Nov 2013 16:30:10 +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=bb20bd0fa4db1d91a9c1bb8b7e7953bc3a53e8a0;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: I80be5c523a9df5888bfdef1f07dc619bf0ed0f00
---

bb20bd0fa4db1d91a9c1bb8b7e7953bc3a53e8a0