Merge branch 'master' into release-1.7.0
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 3 Feb 2015 11:46:23 +0000 (12:46 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 3 Feb 2015 11:46:23 +0000 (12:46 +0100)
1  2 
src/com/owncloud/android/authentication/AuthenticatorActivity.java