From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 9 Jul 2013 11:25:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay
X-Git-Tag: oc-android-1.4.3~7^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fffa77e2115c03dfad403b0f9106736256b7c10b?hp=fffa77e2115c03dfad403b0f9106736256b7c10b

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