Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Fri, 16 Aug 2013 16:37:17 +0000 (18:37 +0200)
committermasensio <masensio@solidgear.es>
Fri, 16 Aug 2013 16:37:17 +0000 (18:37 +0200)
commit60947d737c6936081f7469f8e594942c81f0b5ff
treebb25b032ba82320927b707ab29b499215d9efe84
parent1cb6b12869f633dd278d674e59f75369dc4189fa
parentb458c92be0e4e02220316b997702d4dcad1af125
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
src/com/owncloud/android/authentication/AuthenticatorActivity.java