From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 9 Apr 2014 15:44:22 +0000 (+0800)
Subject: Merge tag '2014.1.rc2' into debian/icehouse
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=857eb7077411ee35221303cc729a2d343df11180;p=openstack-build%2Fneutron-build.git

Merge tag '2014.1.rc2' into debian/icehouse

Neutron icehouse-rc2 milestone (2014.1.rc2)

Conflicts:
	neutron/tests/unit/vmware/extensions/test_networkgw.py

Change-Id: I9e1d8789e01c5e35f26fa732b177dffd6caac635
---

857eb7077411ee35221303cc729a2d343df11180