tree 274171c93fe85f8313e03677d09e1a0e03535a1e
parent 57efb8ff7f80bfb88b95ce71913fec95adaff32d
parent f1527cd0c505c94d7ff75f394d1a30446281d41d
author Matteo Scandolo <matteo.scandolo@link-me.it> 1447164796 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1447164796 +0100

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