Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8
authormasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 10:55:45 +0000 (12:55 +0200)
committermasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 10:55:45 +0000 (12:55 +0200)
commit1bee51d2636615e25e74c65af838b89b3d68342a
tree7d6733391e341a756232aa7295b1fe707fdcc2e6
parent542b7c00b31022a44a870d944585db7197189a1b
parentae0b4e5759d95974ac89373960eb79de2bfb1b7c
Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8