From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 7 Oct 2013 18:48:30 +0000 (+0000)
Subject: Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=18c33c1d1e7fcbb66f4e5f9f4a076864d41ff953;p=openstack-build%2Fceilometer-build.git

Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into debian/havana

Conflicts:
	debian/control

Rewritten-From: da0d6bd3500f6d9591aab367aeb0173b0eafe763
---

18c33c1d1e7fcbb66f4e5f9f4a076864d41ff953