Merge branch 'develop' into operations_service
authormasensio <masensio@solidgear.es>
Tue, 1 Apr 2014 12:18:32 +0000 (14:18 +0200)
committermasensio <masensio@solidgear.es>
Tue, 1 Apr 2014 12:18:32 +0000 (14:18 +0200)
commit5ac1a1ebbb78aaa7b85318bd7542b1c047291d19
tree57d287f8c07bac1ff0416d98176552a7fe781f5a
parent11f5a299bda453ad445b0e8961a2177e0e345731
parent1f2b951824ebb14bc613fb625ceba6198902b238
Merge branch 'develop' into operations_service
src/com/owncloud/android/authentication/AuthenticatorActivity.java