| commit | 995556e9e7100867497d9494b3949a7e0b2750e8 | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:08:05 2015 +0200 |
| committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 21 11:08:05 2015 +0200 |
| tree | 3f9e51cb37c1b9d9bd970cff8cfab193c32f9421 | |
| parent | 31396aa53c2b2eb0657cd145d9deefd736d47cbe [diff] | |
| parent | b37c7c8f964a5087aae5b4a8f0cb3ce19ad803db [diff] |
Merge branch 'master' into feature/contentProvider