Merge OC-297
authormasensio <masensio@solidgear.es>
Mon, 10 Jun 2013 11:19:11 +0000 (13:19 +0200)
committermasensio <masensio@solidgear.es>
Mon, 10 Jun 2013 11:19:11 +0000 (13:19 +0200)
commit472b6b48bfa33dac02d12a0d09e91dfd675569a8
treee7edcf3ff1a22b5abde3dc1718c6083522ee44b1
parent9f20cc45ccbbfd73bc51e16bd8abab3be856fcac
parent9ed8579df25d60461e8c5dc56f6d0178232114c1
Merge OC-297
src/com/owncloud/android/authentication/AuthenticatorActivity.java