From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 20 Jun 2013 06:17:31 +0000 (+0200)
Subject: Merge branch 'rescan-all' into scanfolder-remove
X-Git-Tag: v6.0.0alpha2~605^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c1a3f015c9f5d7b0753d1cdb01c8b648233e66b8;p=nextcloud-server.git

Merge branch 'rescan-all' into scanfolder-remove
---

c1a3f015c9f5d7b0753d1cdb01c8b648233e66b8