From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 7 Feb 2014 11:04:02 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ffa7b517841f927c385a02552a2de6a41d62ec79?ds=inline;hp=--cc

Merge branch 'develop' into release-1.5.4
---

ffa7b517841f927c385a02552a2de6a41d62ec79
diff --cc owncloud-android-library
index 815fbba4,815fbba4..d673c0a2
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 815fbba48677e40bff2c3c114c4ce8dd1e35bc17
++Subproject commit d673c0a20f41b6398fbc81f8e87d3711f0560d68