tree fd45389152feb7d88c8726651aef44fe2be146a6
parent a8fc938f90ee343781ab2bf6cf18c4babce1c9c0
parent 44673d302d0ea2153c6196cb8bd2e77270e1f8c1
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