Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 11:49:31 +0000 (13:49 +0200)
committermasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 11:49:31 +0000 (13:49 +0200)
commitce1e0c210a779550de9bc7a6dadb901033a99801
tree6bfbf1f0ef2fdfd2b66fb82a80b6e490334b5866
parent4047c62527abb058513554eeb3891b032948d084
parent11389ddeb2392da17a7fecdbd2cb13345b55d0a3
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
src/com/owncloud/android/authentication/AuthenticatorActivity.java