tree 274171c93fe85f8313e03677d09e1a0e03535a1e
parent 1506ca534b0b4b4f02617f8e8445e19c721fc49c
parent 89a338c5c44192a434ec8a9b7438d8a1a908ea83
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