tree 82376a9aa930da97e509daac91094c743c1339d7
parent 699b4e9ea7dc1e0d34e234fbe2fbb6e7114582a1
parent d5428676d12ed90ce8261281914d6d376ac06164
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