From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 7 May 2014 08:03:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into... 
X-Git-Tag: oc-android-1.7.0_signed~309^2~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e42fcc1e32fcf129889e5b58b3bc2a9fda5f4c16?hp=e42fcc1e32fcf129889e5b58b3bc2a9fda5f4c16

Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
---