Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/horizon into...
authorThomas Goirand <zigo@debian.org>
Thu, 2 Apr 2015 14:31:20 +0000 (16:31 +0200)
committerThomas Goirand <zigo@debian.org>
Thu, 2 Apr 2015 14:31:20 +0000 (16:31 +0200)
commit0b11c1a0b1bf17f3f68cc63eac709eea6aba4ab8
treeeacea9b98d911fa10d07b19022eef9ba5acdbe75
parent9b1b706cca6ddcb5d27daf527d0b313c04fae6d1
parentea6eee613870f5760cfb345e05d5a78b68785355
Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/horizon into debian/kilo

Rewritten-From: 2c2a1e9448fece12846a2d75834aacaa4f1e5d48