From: David A. Velasco Date: Fri, 23 Aug 2013 12:33:23 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired... X-Git-Tag: oc-android-1.4.6~17^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/43660cb8bd43938bec7ed8529b2bbbde64acbe8f?hp=--cc Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired --- 43660cb8bd43938bec7ed8529b2bbbde64acbe8f