From: masensio <masensio@solidgear.es>
Date: Wed, 29 Jan 2014 17:23:33 +0000 (+0100)
Subject: Merge branch 'develop' into share_link_show_shared_files
X-Git-Tag: oc-android-1.5.5~35^2~42
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/45c1e47e5fcc4ed0a55601725813810982746109

Merge branch 'develop' into share_link_show_shared_files
---

45c1e47e5fcc4ed0a55601725813810982746109