Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 09:39:26 +0000 (11:39 +0200)
committermasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 09:39:26 +0000 (11:39 +0200)
commiteb437200aa572a98b947ceac0a1b50972a6be6c6
treebed7d5dc6c387dddad1d2c2590f26a441b4d686e
parent5066193e58ea77f0a507d790f9487fc3269ae3b0
parente7d9114859d63ac8fb4d1ff652a16b754ed7f428
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
src/com/owncloud/android/authentication/AuthenticatorActivity.java