tree 4dcf39923c4b1b79a4f3fd6a9d59ad92bc419b66
parent cc03252357cb0ba0e86da316f4617bcd1ed403af
parent c18f97a47b9944d59b0d4e192a137ad5e7888334
author Matteo Scandolo <matteo.scandolo@link-me.it> 1445602171 +0200
committer Matteo Scandolo <matteo.scandolo@link-me.it> 1445602171 +0200

Merge branch 'feature/contentProvider' into develop