Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 14 Aug 2013 15:16:42 +0000 (17:16 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 14 Aug 2013 15:16:42 +0000 (17:16 +0200)
commitebd6888ed1c7fd1c2436b491e0fbfb185f5ab5c4
treebb25b032ba82320927b707ab29b499215d9efe84
parent1cb6b12869f633dd278d674e59f75369dc4189fa
parentb458c92be0e4e02220316b997702d4dcad1af125
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
src/com/owncloud/android/authentication/AuthenticatorActivity.java