From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 19 Nov 2014 10:11:15 +0000 (+0100)
Subject: Merge branch 'develop' into nea_upload_files
X-Git-Tag: oc-android-1.7.0_signed~101^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d737103a779b94fbbd83823546a0a19c90a9f717?ds=inline;hp=--cc

Merge branch 'develop' into nea_upload_files
---

d737103a779b94fbbd83823546a0a19c90a9f717