From: David A. Velasco Date: Fri, 21 Mar 2014 10:02:36 +0000 (+0100) Subject: Merge branch 'develop' into regular_authentication_in_saml_server X-Git-Tag: oc-android-1.5.5~5^2~1^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a3bf6883fc8182030bd9304e289a4a2d80f7e1f2?ds=inline;hp=--cc Merge branch 'develop' into regular_authentication_in_saml_server --- a3bf6883fc8182030bd9304e289a4a2d80f7e1f2