From: jabarros <jabarros@solidgear.es>
Date: Mon, 29 Dec 2014 08:27:50 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnailForUpload
X-Git-Tag: oc-android-1.7.0_signed~42^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2319a52bab758aaf04438da73e9f7a7712a3396e?hp=--cc

Merge branch 'develop' into thumbnailForUpload
---

2319a52bab758aaf04438da73e9f7a7712a3396e