Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into...
authorThomas Goirand <thomas@goirand.fr>
Mon, 7 Oct 2013 18:48:30 +0000 (18:48 +0000)
committerThomas Goirand <thomas@goirand.fr>
Mon, 7 Oct 2013 18:48:30 +0000 (18:48 +0000)
commit18c33c1d1e7fcbb66f4e5f9f4a076864d41ff953
treebebe326cd88e3d59b9e67d0c72ca9757257685be
parent5659effb2b07978c09daa7f87e08ba5044b1e04f
parent4ef6415723e7b5075eec7942916f4f974e981b29
Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into debian/havana

Conflicts:
debian/control

Rewritten-From: da0d6bd3500f6d9591aab367aeb0173b0eafe763