From: jabarros <jabarros@solidgear.es>
Date: Wed, 7 Jan 2015 13:04:46 +0000 (+0100)
Subject: Merge branch 'develop' into download_folder
X-Git-Tag: oc-android-1.7.0_signed~23^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d05d5ffe1a5b7a4f470afa541515a0b9c7eb9f59?hp=d05d5ffe1a5b7a4f470afa541515a0b9c7eb9f59

Merge branch 'develop' into download_folder
---