From: masensio Date: Fri, 16 Aug 2013 16:37:17 +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~22 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/60947d737c6936081f7469f8e594942c81f0b5ff?ds=inline;hp=--cc Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired --- 60947d737c6936081f7469f8e594942c81f0b5ff