tree 42e0f21fd5ed12d8940075b3314eb35f3e4008ac
parent ce1b52cee1f16a81cd04eba443844321532de9b8
parent 69d3025d570aff6c91eb4e8b692aef14d3c86806
author Matteo Scandolo <matteo.scandolo@link-me.it> 1444902873 +0200
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1444902873 +0200

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