From: masensio Date: Wed, 19 Mar 2014 16:57:56 +0000 (+0100) Subject: Merge branch 'develop' into regular_authentication_in_saml_server X-Git-Tag: oc-android-1.5.5~5^2~1^2~11 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/432d696432b5a86aa81d510b01a9db2ca26c2164?ds=inline;hp=--cc Merge branch 'develop' into regular_authentication_in_saml_server --- 432d696432b5a86aa81d510b01a9db2ca26c2164