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