Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/neutron into...
authorThomas Goirand <zigo@debian.org>
Sun, 14 Jun 2015 13:57:54 +0000 (15:57 +0200)
committerThomas Goirand <zigo@debian.org>
Sun, 14 Jun 2015 13:57:54 +0000 (15:57 +0200)
Rewritten-From: 0f06d3cb910c97bd88b0b2fe061b466cb66e0ccd


Trivial merge