Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:32:03 +0000 (14:32 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:32:03 +0000 (14:32 +0200)
commitea5cd96679e66b81f9789b5667eecfc99846de1a
treeade69ade14ab4a9e724d88a99f5695222f62cdcf
parent2b1b98478bb75f8c9fc5390461067190c09a62ee
parent3072a29730c5d3af409a7f0a0e07598caf3b36c3
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on
src/com/owncloud/android/authentication/AuthenticatorActivity.java