From: masensio Date: Tue, 27 Aug 2013 09:39:26 +0000 (+0200) Subject: Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s... X-Git-Tag: oc-android-1.4.6~17^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/eb437200aa572a98b947ceac0a1b50972a6be6c6?hp=--cc Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired --- eb437200aa572a98b947ceac0a1b50972a6be6c6