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)
commitfbfb6dee90f275735c389917d99474d0488bd6d2
tree7590c98f2eee663d757cbe0b326e96cc6e1fc169
parent66f3a45d050c27e41296ddc9083d968cfd8803a4
parent0b567b9713475d19fe586799a2e068f072c25da0
Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic

Conflicts:
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java