From: masensio <masensio@solidgear.es>
Date: Tue, 11 Mar 2014 09:54:10 +0000 (+0100)
Subject: Merge branch 'develop' into check_server_certificates_in_SSO_webview
X-Git-Tag: oc-android-1.5.5~15^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65d590b8e7ddb2c91a63f3104037dc3f7197f6bd?hp=-c

Merge branch 'develop' into check_server_certificates_in_SSO_webview
---

65d590b8e7ddb2c91a63f3104037dc3f7197f6bd
diff --combined owncloud-android-library
index e8a6c642,1dbc9a12..268681db
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e8a6c642a0f5e0d1a878164f893344d7c6b61c6d
 -Subproject commit 1dbc9a121e8818d0202d3aaec31bce1335ee428b
++Subproject commit 268681dbffbd15b820fd0a29211c62c88135203d