From: masensio Date: Wed, 19 Mar 2014 07:55:37 +0000 (+0100) Subject: Merge branch 'develop' into regular_authentication_in_saml_server X-Git-Tag: oc-android-1.5.5~5^2~1^2~13 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3e108163bca94944dab7881b6ad7e92b787036ca Merge branch 'develop' into regular_authentication_in_saml_server --- 3e108163bca94944dab7881b6ad7e92b787036ca