From: David A. Velasco Date: Wed, 14 Aug 2013 15:16:42 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b... X-Git-Tag: oc-android-1.4.6~17^2~21^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ebd6888ed1c7fd1c2436b491e0fbfb185f5ab5c4?hp=--cc Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired --- ebd6888ed1c7fd1c2436b491e0fbfb185f5ab5c4