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?ds=sidebyside;hp=--cc

Merge branch 'develop' into share_link__unshare_file
---

ebbc1793e23f67dc7aa2214a542fa2c037fcf4c2
diff --cc owncloud-android-library
index 815fbba4,815fbba4..985b0059
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 815fbba48677e40bff2c3c114c4ce8dd1e35bc17
++Subproject commit 985b005995429f52446dc5bb66abd236595e627e