From: masensio <masensio@solidgear.es>
Date: Tue, 11 Feb 2014 09:56:31 +0000 (+0100)
Subject: Merge branch 'develop' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~48^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c68012235a0f16b12eba3ffb01bd373e57b4b59f?ds=inline;hp=-c

Merge branch 'develop' into share_link__unshare_file
---

c68012235a0f16b12eba3ffb01bd373e57b4b59f