Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 12 Aug 2013 11:21:01 +0000 (13:21 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 12 Aug 2013 11:21:01 +0000 (13:21 +0200)
commit830bb7c85303e8725203d083940e4bfc568a405f
treeb8f710b397f145214b6206765cc710c8402b6696
parent68df3cbfe7a7bc6d4df4bd435383ae70e4742496
parentdd9fe3e57294dcc01770db4a8c7cd2dfef5c97b3
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
src/com/owncloud/android/authentication/AuthenticatorActivity.java