tree 4b4a3f7a3d26de204d740d5c9f423e8e2e586ead
parent 574c73f8adec22d9748b9036a9172b703bbd6355
parent d66d036da90f0f11f6ebae356b1a3488a5bc76fa
author Matteo Scandolo <teo@onlab.us> 1456935614 -0800
committer Matteo Scandolo <teo@onlab.us> 1456935614 -0800

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