tree 82376a9aa930da97e509daac91094c743c1339d7
parent 555bad533b4c55134fc0e5b9e3e6b81501649390
parent 3185a894b6439b85ccb96bdd0ecf5bc672d76aef
author Matteo Scandolo <teo@onlab.us> 1449073237 -0800
committer Matteo Scandolo <teo@onlab.us> 1449073237 -0800

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