tree 02b4dd38cdc1eec22e90729f47175d04781abd4a
parent e95d7b313e94b59b23573357c3e7861ccd057bc2
parent a8c8a42dec7d1e138421f1cb7e0d0c45af3cf219
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