From: jabarros <jabarros@solidgear.es>
Date: Tue, 20 Jan 2015 11:42:27 +0000 (+0100)
Subject: Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into... 
X-Git-Tag: oc-android-1.7.0_signed~23^2~8^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6?hp=d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6

Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
---