From: jabarros <jabarros@solidgear.es>
Date: Wed, 19 Nov 2014 17:40:06 +0000 (+0100)
Subject: Merge branch 'develop' into instant_uploads_set_path
X-Git-Tag: oc-android-1.7.0_signed~15^2~5^2^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1435e8c40645f9e5855246f216348d83b4450432?hp=--cc

Merge branch 'develop' into instant_uploads_set_path
---

1435e8c40645f9e5855246f216348d83b4450432