Merge branch 'fixed_contradicted_messages_in_login_view' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 10:17:16 +0000 (12:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 10:17:16 +0000 (12:17 +0200)
commit0c7f1af8d05cb44b9f76e57dda28976427123f65
tree880b49ac410b332d8f3fc1dea16a8e48cc058b9f
parentd612f37de46ac4f88d7b205a999213f3497398ee
parent30ab377413b9e37cfb83caca70eccb78852a5bc8
Merge branch 'fixed_contradicted_messages_in_login_view' into develop
src/com/owncloud/android/authentication/AuthenticatorActivity.java