Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/ceilometer into...
authorThomas Goirand <zigo@debian.org>
Thu, 4 Jun 2015 09:10:24 +0000 (11:10 +0200)
committerThomas Goirand <zigo@debian.org>
Thu, 4 Jun 2015 09:10:24 +0000 (11:10 +0200)
Rewritten-From: f53b9a5ba3243174d861ecadf35f052dfc3bf5d2


Trivial merge