tree aaa603503644380b1ae69dfc3b795459b5f615bf
parent 653c509bdc1a22f925aac9aca58031536a0d4292
parent 02328a5d7486f3345d97fe36a1250acc7a4f15af
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