Merge branch 'master' of github.com:owncloud/android
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)
commit8090269d557590a6d50f184006abef6c9bb7d399
tree19f3dc06d22f66d86876b3ea216540b2ae751d85
parent5a8f605ed99317b8baaedcadc24602d99db665e2
parent6a9f1ad08c169b645e3120a58febc5d661bc82f2
Merge branch 'master' of github.com:owncloud/android

Conflicts:
CHANGELOG.md