tree 86e9cd1c8815a6a8ef1e7725d546a7535bea1cc6
parent c0128564c69a7aea992b0f4e33c676d0a4fe145c
parent a8e45e8e6e2d63a31e453c0cca884e256de9d2e9
author Matteo Scandolo <teo@onlab.us> 1454970253 -0800
committer Matteo Scandolo <teo@onlab.us> 1454970253 -0800

Merge branch 'master' into feature/ceilometer