From: jabarros <jabarros@solidgear.es>
Date: Mon, 19 Jan 2015 11:49:28 +0000 (+0100)
Subject: Merge branch 'develop' into download_folder
X-Git-Tag: oc-android-1.7.0_signed~23^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e98fc8b141fed66cbdd265aaebd2cfa3affb68ac?hp=e98fc8b141fed66cbdd265aaebd2cfa3affb68ac

Merge branch 'develop' into download_folder
---