From: masensio <masensio@solidgear.es>
Date: Fri, 7 Mar 2014 14:11:59 +0000 (+0100)
Subject: Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_... 
X-Git-Tag: oc-android-1.5.5~15^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9cac3b60a574f2b82cb3b33b45d3a4ba9a2f4d3e?hp=9cac3b60a574f2b82cb3b33b45d3a4ba9a2f4d3e

Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview
---