From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 10 Jul 2015 06:43:23 +0000 (+0200)
Subject: Merge branch 'develop' into shareWithYou_icon_in_fileList
X-Git-Tag: oc-android-1.8~62^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/59a9bc80044decef7f1bd8f9b42d0b0b79f1b09d

Merge branch 'develop' into shareWithYou_icon_in_fileList
---

59a9bc80044decef7f1bd8f9b42d0b0b79f1b09d