tree c1dd45f2907cdc5e1a383d25b9899a71d638854b
parent d4ea877aadf6ec8ac6b288525f5d622b32acbe52
parent a1344fc8d82cab579edb82ee00ac35c42186c72c
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