tree 0e7ff3f594775021e644163a25219a30d0d2eb0f
parent 15d91d6466423e63ce8031bbaacd20cdf87ed9c6
parent 0df64fa6ceb02e9d784bdc1b993041803cb0f137
author Matteo Scandolo <matteo.scandolo@link-me.it> 1445963590 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1445963590 +0100

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