From: Thomas Goirand <thomas@goirand.fr>
Date: Sat, 3 May 2014 03:21:46 +0000 (+0000)
Subject: Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6298c540b10f60b58e73476f5fb79c99b4810eb2;p=openstack-build%2Fneutron-build.git

Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into debian/icehouse

Conflicts:
	debian/changelog
---

6298c540b10f60b58e73476f5fb79c99b4810eb2
diff --cc debian/changelog
index 6396de96d,fb0c53a69..e2085d021
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,10 @@@
 -neutron (2014.1-2) UNRELEASED; urgency=low
 +neutron (2014.1-2) unstable; urgency=medium
  
 -  * Fixed fr.po (Closes: #745249). Thanks to Christian Perrier for this.
 +  * Unbreaks fr.po, thanks to Christian Perrier (Closes: #745249).
 +  * Added it.po thanks to Beatrice Torracca (Closes: #746575).
+   * Added a Provides: neutron-plugin-ml2 in neutron-common (LP: #1309858).
  
 - -- Thomas Goirand <zigo@debian.org>  Sun, 20 Apr 2014 09:50:09 +0800
 + -- Thomas Goirand <zigo@debian.org>  Sat, 03 May 2014 02:22:50 +0000
  
  neutron (2014.1-1) unstable; urgency=medium