From: masensio <masensio@solidgear.es>
Date: Thu, 30 Apr 2015 11:23:37 +0000 (+0200)
Subject: Merge branch 'develop' into fix_upload_fails_sending_another_app
X-Git-Tag: test~20^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce9f67ba14a3cc538806461be27019102a56d68d?hp=--cc

Merge branch 'develop' into fix_upload_fails_sending_another_app
---

ce9f67ba14a3cc538806461be27019102a56d68d