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)
1  2 
src/com/owncloud/android/authentication/AuthenticatorActivity.java