Merge branch 'develop' into shareWithYou_icon_in_fileList
authorpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:43:23 +0000 (08:43 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:43:23 +0000 (08:43 +0200)

Trivial merge