From: David A. Velasco Date: Fri, 23 Aug 2013 07:08:51 +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~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8aa08be8706131a60f3a249c4ac9d326d4dfde53?ds=inline;hp=--cc Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired --- 8aa08be8706131a60f3a249c4ac9d326d4dfde53