From: jabarros <jabarros@solidgear.es>
Date: Mon, 12 Jan 2015 13:30:06 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnailForUpload
X-Git-Tag: oc-android-1.7.0_signed~42^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6c70154a506b0963ed5aa0a402dc80a2933f1087?hp=6c70154a506b0963ed5aa0a402dc80a2933f1087

Merge branch 'develop' into thumbnailForUpload
---