tree ae69588fdd6bc5af0b1b945fb0eaa8a490007982
parent 0585c04ec93ad590f45b71c37b5d692e1c20cfb5
parent d86563da355741ee5471109673708adda69076ec
author Matteo Scandolo <teo@onlab.us> 1456940016 -0800
committer Matteo Scandolo <teo@onlab.us> 1456940016 -0800

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