From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Jul 2014 12:21:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
X-Git-Tag: oc-android-1.7.0_signed~264^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dacc14a882be8b499c00ad2f75b68e10a42dee9e?ds=inline;hp=--cc

Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
---

dacc14a882be8b499c00ad2f75b68e10a42dee9e
diff --cc owncloud-android-library
index 8080e490,f323dda0..3c116514
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8080e4904de8f042fdff17691674e900607c66a8
 -Subproject commit f323dda0445b455af638c7e8e4653c22959adb91
++Subproject commit 3c116514fb33992d050f7051e756b6c2244953b0