tree 3b3c112d8f51d2e5d78abea95b3f45ffd41058b6
parent a03110cf3236429fc7fab80427ab2f95f0067d42
parent 327bcff58616a2e7dd36f3cd0903cffed8607e90
author Matteo Scandolo <teo@onlab.us> 1456879773 -0800
committer Matteo Scandolo <teo@onlab.us> 1456879773 -0800

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