Merge branch 'debian/mitaka' of git+ssh://git.debian.org/git/openstack/cinder into...
authorThomas Goirand <zigo@debian.org>
Tue, 5 Apr 2016 08:48:23 +0000 (10:48 +0200)
committerThomas Goirand <zigo@debian.org>
Tue, 5 Apr 2016 08:48:23 +0000 (10:48 +0200)
commit43021241adab3e149c666e54d13a8f953b343137
tree2236ee1933e9875193abc18cbe726e2f0f97b19d
parent17663843afe9719f93496c07f47c8f7d1bbe66e0
parent6c0eba94137b99c3a8dc90ed41ae22d4a331bf9c
Merge branch 'debian/mitaka' of git+ssh://git.debian.org/git/openstack/cinder into debian/mitaka

Conflicts:
debian/changelog
debian/po/fr.po
debian/po/ja.po
debian/po/pt.po
debian/po/sv.po

Rewritten-From: 3cf5fdb953cb900127d597ff60d8727654812662
xenial/debian/changelog
xenial/debian/po/fr.po
xenial/debian/po/ja.po
xenial/debian/po/pt.po
xenial/debian/po/sv.po