From: masensio <masensio@solidgear.es>
Date: Fri, 7 Feb 2014 11:02:38 +0000 (+0100)
Subject: Merge branch 'develop' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~48^2~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ebbc1793e23f67dc7aa2214a542fa2c037fcf4c2?hp=ebbc1793e23f67dc7aa2214a542fa2c037fcf4c2

Merge branch 'develop' into share_link__unshare_file
---