From: David A. Velasco Date: Wed, 16 Apr 2014 17:31:27 +0000 (+0200) Subject: Merge branch 'develop' into videoInstandUploads X-Git-Tag: oc-android-1.7.0_signed~332^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/33b0909e7bdcab690cd307829b0a49e26a7e69da?hp=--cc Merge branch 'develop' into videoInstandUploads --- 33b0909e7bdcab690cd307829b0a49e26a7e69da