tree fd45389152feb7d88c8726651aef44fe2be146a6
parent f9327f8761170247d9b94abd0f9200949478d280
parent b771d46e33495b2485d81b9d2b8f506048c0c80d
author Matteo Scandolo <matteo.scandolo@link-me.it> 1447064932 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1447064932 +0100

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