tree a73cba0948f4499135958415b560d6987275c601
parent 882aca52d4be734a01ccb515e11b6d0a8c9cbfd8
parent 45013ae1143509673911802a0c614c29d6e6e72f
author Matteo Scandolo <matteo.scandolo@gmail.com> 1465866656 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> 1465866656 -0700

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