From: jabarros <jabarros@solidgear.es>
Date: Fri, 19 Dec 2014 09:58:08 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnailForUpload
X-Git-Tag: oc-android-1.7.0_signed~42^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6e3d3cd016c235462d9f623622dfaaefb77fec95?hp=--cc

Merge branch 'develop' into thumbnailForUpload
---

6e3d3cd016c235462d9f623622dfaaefb77fec95