From: David A. Velasco Date: Thu, 22 Aug 2013 15:50:11 +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~11 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/316a0a12ad4799ed0d43182a5b1b9bc04fbecee5?ds=inline;hp=316a0a12ad4799ed0d43182a5b1b9bc04fbecee5 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired ---