From: masensio Date: Mon, 24 Mar 2014 08:31:43 +0000 (+0100) Subject: Merge branch 'develop' into regular_authentication_in_saml_server X-Git-Tag: oc-android-1.5.5~5^2~1^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1bda7e1e872273e48cc5bf1ae8f289e6d03f00ab?ds=inline Merge branch 'develop' into regular_authentication_in_saml_server --- 1bda7e1e872273e48cc5bf1ae8f289e6d03f00ab