From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 31 Oct 2013 08:05:35 +0000 (+0100)
Subject: Merge branch 'master' into fix_privatedata
X-Git-Tag: v6.0.0beta3~28^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=64bfd21ccd25231b86ba4c3b95993dc205c8ea3b;p=nextcloud-server.git

Merge branch 'master' into fix_privatedata
---

64bfd21ccd25231b86ba4c3b95993dc205c8ea3b