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

Conflicts:
	debian/changelog

Rewritten-From: 6298c540b10f60b58e73476f5fb79c99b4810eb2

diff --cc trusty/debian/changelog
index 6396de96d7b2023e7c50252179ee5ad3fce696b1,fb0c53a69a709ee267a4125d03173e4cd6c5190b..e2085d02109b978a20f4631ec095399b461d1f4f
--- 1/trusty/debian/changelog
--- 2/trusty/debian/changelog
+++ b/trusty/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