From: masensio <masensio@solidgear.es>
Date: Thu, 6 Feb 2014 10:23:30 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~35^2~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1bdf1e60f1c18762d0a77543f74a2c28fb859557?hp=-c

Merge branch 'share_link__new_share' into share_link__unshare_file
---

1bdf1e60f1c18762d0a77543f74a2c28fb859557
diff --combined owncloud-android-library
index f166bcdd,d96e31b5..e9a1ee81
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f166bcdd8b52a64c3ad0c8725ed64ba768c1eeb5
 -Subproject commit d96e31b5e595518dc6365e5b290dba124140dc26
++Subproject commit e9a1ee81ca37182963467f85476de0fbc216d2e7