tree 9679cdedf3729b02999c235ad904e9226fff425f
parent c18f97a47b9944d59b0d4e192a137ad5e7888334
parent 06cd26e8a9c625d4485833b320b9fc3d6e337290
author Matteo Scandolo <matteo.scandolo@link-me.it> 1445601040 +0200
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1445601040 +0200

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