From: masensio Date: Sat, 17 Aug 2013 08:33:00 +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~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/595f9b8ecda5ce46fb4df0d71a8cd862abd76881?hp=--cc Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired --- 595f9b8ecda5ce46fb4df0d71a8cd862abd76881