From: masensio Date: Thu, 20 Mar 2014 08:02:29 +0000 (+0100) Subject: Merge branch 'develop' into regular_authentication_in_saml_server X-Git-Tag: oc-android-1.5.5~5^2~1^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/09cc36272b9307f891605439ba877864c1c5b791 Merge branch 'develop' into regular_authentication_in_saml_server --- 09cc36272b9307f891605439ba877864c1c5b791