tree 00884a384e33270fda888eb3d6ef844c3fc6a8d7
parent 7e81e75f611f61199271a83530e200cc164cb25d
parent c1018542c75fc7d1eda12e42dc36337c8844541a
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