From: masensio <masensio@solidgear.es>
Date: Tue, 8 Apr 2014 10:50:50 +0000 (+0200)
Subject: Merge branch 'develop' into videoInstandUploads
X-Git-Tag: oc-android-1.7.0_signed~332^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3351db65273a8d8ff1d012e00025e728cc428419?ds=inline;hp=3351db65273a8d8ff1d012e00025e728cc428419

Merge branch 'develop' into videoInstandUploads
---