tree 8b0b6fd701d1db5f6f1d3703c3e39a122e658892
parent 869acc535338f8367bbacb2a6185f83a58c38e9a
parent 0f908e0dd00cb0b1e009a426d5e6260739666b51
author Matteo Scandolo <teo@onlab.us> 1450121276 -0800
committer Matteo Scandolo <teo@onlab.us> 1450121276 -0800

Merge branch 'master' of github.com:open-cloud/xos into feature/ceilometerDashboard