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=65d590b8e7ddb2c91a63f3104037dc3f7197f6bd

Merge branch 'develop' into check_server_certificates_in_SSO_webview
---