tree 02b4dd38cdc1eec22e90729f47175d04781abd4a
parent 2a778e6a01d503740df85e4bd26641945d002089
parent 149874311e311416c05474e74388d2aefe01c86a
author Matteo Scandolo <matteo.scandolo@link-me.it> 1447403645 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1447403645 +0100

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