Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
authormasensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
committermasensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
Conflicts:
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java


No differences found