tree 847a97caba102ccb984fbe708a87e4fb8c4b447a
parent 3026d1a2838b1f03515b9c9a05ade0673bb49000
parent f9c2d18ceb3937c0a67402a2174e2bd37c16082d
author Matteo Scandolo <matteo.scandolo@link-me.it> 1445876710 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1445876710 +0100

Merge branch 'feature/xosContentProvider' into develop