From: masensio <masensio@solidgear.es>
Date: Tue, 27 Aug 2013 11:49:31 +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
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce1e0c210a779550de9bc7a6dadb901033a99801?hp=ce1e0c210a779550de9bc7a6dadb901033a99801

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
---