From: masensio <masensio@solidgear.es>
Date: Mon, 20 Jan 2014 10:36:10 +0000 (+0100)
Subject: Merge branch 'develop' into share_link_show_shared_files
X-Git-Tag: oc-android-1.5.5~35^2~61
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2da9af38711adf0f69913a8e011ac4e7f5220668?hp=--cc

Merge branch 'develop' into share_link_show_shared_files
---

2da9af38711adf0f69913a8e011ac4e7f5220668