tree f402da4ed6bf49718de953864f839124832d0625
parent 5bb1668f1e130dbd42d1ccf55bb844f17b31a47c
parent 6a96758ed098725d9d1f5ceb8dcf6ce28cabf460
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