tree 847a97caba102ccb984fbe708a87e4fb8c4b447a
parent 6c58040c8906075709024cfab55fee07ba1136bf
parent 39f71ade349752f58469f4d34d552c5bc9dc8e47
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