tree a1a2379d5950e770c5672702db1a44bce247d6b9
parent f0d6e699b4be0b0d92373c529b0170e2c298f5e4
parent 958226f317b4f3c3c78e83f26589d427e0e97c73
author Matteo Scandolo <teo@onlab.us> 1456341247 -0800
committer Matteo Scandolo <teo@onlab.us> 1456341247 -0800

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