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)
commit5116bd99e26954fb83621863ff26e351d0a08cfd
tree3edbba58bfd4da3c9453cd2077cf869938f1d3fa
parent5169261b66eb47a3730c3836199c251a4d5d7286
parent0dfe4d27c77b689e179939b8cad2bbb6a4e388ba
Merge branch 'master' into release-1.7.0
src/com/owncloud/android/authentication/AuthenticatorActivity.java